Merge pull request Simple-Station#306 from neuPanda/patch-1

Remove Rape and SA From S-LAW
Mnemotechnician · Oct 29, 2024 · 3d26809 · 3d26809
2 parents 197592b + 437ec45
commit 3d26809
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 9 deletions.
diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml
@@ -1245,3 +1245,49 @@ Entries:
   id: 167
   time: '2024-10-27T11:23:21.0000000+00:00'
   url: https://github.com/Fansana/floofstation1/pull/293
+- author: FoxxoTrystan
+  changes:
+    - type: Remove
+      message: Removed the blue nukie suits.
+  id: 168
+  time: '2024-10-27T17:24:07.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/298
+- author: Fansana
+  changes:
+    - type: Tweak
+      message: Nerf mimic vendor, only appears after 20 minutes now
+  id: 169
+  time: '2024-10-27T22:27:22.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/297
+- author: FoxxoTrystan
+  changes:
+    - type: Fix
+      message: Anomaly Spawn.
+    - type: Fix
+      message: Arrival Shuttle going in the dark.
+    - type: Fix
+      message: Ethereal Portal Glitch
+  id: 170
+  time: '2024-10-27T22:46:49.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/299
+- author: Fansana
+  changes:
+    - type: Add
+      message: added neck floof for lizards
+  id: 171
+  time: '2024-10-28T16:15:54.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/301
+- author: Fansana
+  changes:
+    - type: Add
+      message: added neck floof for lizards
+  id: 172
+  time: '2024-10-28T16:16:06.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/300
+- author: Fansana
+  changes:
+    - type: Tweak
+      message: Give thermal insulation to penguins
+  id: 173
+  time: '2024-10-29T14:42:16.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/302
diff --git a/Resources/ServerInfo/SpaceLaw/SpaceLaw.md b/Resources/ServerInfo/SpaceLaw/SpaceLaw.md
@@ -20,7 +20,7 @@
 | 14   |                         | Harassment                |                    |
 | 15   | Hooliganism             | Rioting                   | Sedition           |
 | 16   |                         | Contempt of Court         |                    |
-| 17   |                         | Sexual Harassment         | Rape               |
+| 17   |                         |                           |                    |
 | 18   | Failure To Comply       | Obstruction of Justice    |                    |
 | 19   |                         |                           |                    |
 | 20   |                         |                           |                    |
@@ -103,10 +103,6 @@ Code.-210-Charge: 5 Minutes.
 To unlawfully confine or restrict the free movement of a sophont against their will.
 Code.-208-Charge: 8 Minutes
 
-### Sexual Harassment
-To sexually harass, attempt to coerce into sexual relations, or effect unwanted sexual contact with an unwilling sophont.
-Code.-217-Charge: 6 minutes
-
 ### Endangerment
 To recklessly abandon obligations involving the continued well-being and/or protection of life and property, through malpractice, action, or inaction.
 Code.-213-Charge: 4 Minutes
@@ -158,10 +154,6 @@ Code.-308-Charge: Capital, Capital crimes necessitate a mandatory trial.
 To act to overthrow a lawfully established Chain of Command or governing body without lawful or legitimate cause.
 Code.-315-Charge: Capital, Capital crimes necessitate a mandatory trial.
 
-### Rape
-To force sexual relations on an unwilling sophont
-Code 317-Charge: Capital, Capital crimes necessitate a mandatory trial.
-
 ### Grand Endangerment
 To egregiously and recklessly abandon obligations involving the continued wellbeing and/or protection of life and property, through malpractice, action, or inaction, resulting in significant harm, injury, or death to multiple sophonts.
 Code.-313- Charge: Capital, Capital crimes necessitate a mandatory trial.