cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,521 Commits 8 Branches 0 Tags
bcced2f53bfd3d8a5780f3ee5657e9d8869bc6a3
Commit Graph

23611 Commits

Author SHA1 Message Date
Verkister
bcced2f53b Fixes sleeperbellies not supplying air to occupant 
Fixes sleeperbellies forcing the occupant to breathe external atmosphere and killing the occupant in hostile external environments.
 2020-01-11 17:13:10 +02:00
Novacat
24da40a882 Merge pull request #6426 from Heroman3003/dronedroppod 
Adds new random event: drone drop pod
 2020-01-11 01:19:16 -05:00
Novacat
e1f3b56f74 Revert "Temporarily removes update_client_z from /logout" 2020-01-11 01:08:14 -05:00
Heroman
47086d7bf0 Adds new event: drone drop pod 2020-01-11 16:02:12 +10:00
Heroman
a570cafa2a Adds taur cloak and dress to loadout 2020-01-11 11:33:58 +10:00
Heroman
ed3e4230a2 Temporarily removes update_client_z from /logout 2020-01-11 08:04:41 +10:00
Atermonera
d5775d03be Merge pull request #6610 from Schnayy/glitterfly_borg 
Adds Pyralis borg sprite
 2020-01-10 01:11:20 -05:00
Novacat
022c7edaae Merge pull request #6405 from Mithrandalf/mouse3 
more mouse stuff, bugfix
 2020-01-09 22:51:47 -05:00
Novacat
4f6a7972d6 Merge pull request #6404 from Ketrai/iwantdie 
adds food cubes.
 2020-01-09 22:51:32 -05:00
Novacat
744758091b Merge pull request #6388 from Holdelta/BorgPetting 
Adding borg petting
 2020-01-09 22:51:19 -05:00
Novacat
658c0560c8 Merge pull request #6380 from Heroman3003/vore_laws 
Adds some vorish silicon lawsets
 2020-01-09 22:50:58 -05:00
Novacat
afb879ae23 Merge pull request #6379 from Heroman3003/resleeving_sickness 
Adds resleeving sickness
 2020-01-09 22:50:42 -05:00
Novacat
9b2ff8f8f7 Merge pull request #6312 from TheFurryFeline/TFF-No_Absorbee,_No_Absorbee,_Noooo_Absorbee 
Absorption Permission Stuff
 2020-01-09 22:50:18 -05:00
Heroman3003
5f05d26eb9 Merge branch 'master' into resleeving_sickness 2020-01-10 09:43:42 +10:00
Heroman
a9c1f48a93 Adds a single cure pill to vault, doubles amount ERT gets, changes taste 2020-01-10 09:31:51 +10:00
Heroman
0c5ddf8cbb Stat adjustments 2020-01-09 09:07:11 +10:00
Heroman
c693bf558d Does virgo-side of xenoflora expansion 2020-01-09 08:30:42 +10:00
Novacat
09e10e2901 Merge pull request #6406 from VOREStation/upstream-merge-6592 
[MIRROR] Xenoflora expansion take2
 2020-01-08 17:18:49 -05:00
Novacat
827a798d76 Merge pull request #6409 from VOREStation/upstream-merge-6596 
[MIRROR] Informs ghosts when someone dies
 2020-01-08 17:10:16 -05:00
Atermonera
cb99a0dd4a Merge pull request #6596 from GeneriedJenelle/patch-2 
Informs ghosts when someone dies
 2020-01-08 13:49:06 -05:00
Ketrai
85667c2a9b adds gnomes. (#6595) 
* adds gnomes

* Makes the house nice and bright.

* copypasta error

* Odd

* makes gnomes adminspawn only.

Co-authored-by: KitKetKetrai <49008286+KitKetKetrai@users.noreply.github.com>
 2020-01-08 13:47:41 -05:00
Mechoid
ec5e851399 Xenoflora expansion take2 2020-01-08 13:46:25 -05:00
Ketrai
28eb142141 Adds a recipe for food cubes 2020-01-08 19:45:49 +01:00
Mithrandalf
79557cba8f flicked the 1 to a 0 for machine_understands 2020-01-08 17:02:15 +00:00
Mithrandalf
1e8a54b736 mouse 2020-01-08 15:32:07 +00:00
Ketrai
c8531c827f Fixed conflicts. Adds water bottle to the machine coz logic. 2020-01-07 23:07:50 +01:00
Ketrai
9112a9a2b6 Food cubes 
woop


removes a line of unneeded code
 2020-01-07 22:51:12 +01:00
Heroman
b8d301649c Removes forgotten closing tags 2020-01-07 18:30:30 +10:00
Heroman
2b10027024 Makes the sickness affect only people dying via non-vore deaths, adds fluff version with no downsides 2020-01-07 17:02:39 +10:00
Novacat
6f24070dbd Merge pull request #6400 from VOREStation/upstream-merge-6597 
[MIRROR] Adjusts Emphasize Name Mention
 2020-01-05 20:20:22 -05:00
Andrew
07192b935c Adjusts Emphasize Name Mention (#6597) 
Capitalizes all the words in the not_included section so that they actually get removed from the name check system.

Names can't be lowercase so there is no point in keeping the previous version.
 2020-01-05 18:10:42 -05:00
Heroman
e05fdf6258 Fixes clamp issues 2020-01-06 08:37:27 +10:00
Heroman
9490261230 Adds Kitsuhanan Cure for resleeving sickness 2020-01-06 07:15:13 +10:00
Mechoid
c3079004ea GameMaster Tuning (#6593) 
* Actually Game Master but I am an idiot.
 2020-01-05 01:39:28 -05:00
Novacat
9d21d59be2 Update resleeving_sickness.dm 2020-01-04 17:41:35 -05:00
Heroman
6d35de30b4 Less pain, return of minor burn/brute 2020-01-05 08:17:19 +10:00
Heroman
c434b01190 Wrong calculation + return of speed buff 2020-01-04 09:12:54 +10:00
Heroman
418aa9195a Missed parenthesis 2020-01-04 08:51:48 +10:00
Heroman
a56e3b4990 Rebalances the debuff again, no defensive penalties, much larger offensive penalties 2020-01-04 08:44:23 +10:00
Heroman
88323a1121 Removes genetic mutations, removes cryotubes from resleeving labs 2020-01-04 07:42:57 +10:00
Heroman
489197990c Removes Poly's roundstart headset 2020-01-03 12:57:54 +10:00
Novacat
76f323984c Merge pull request #6373 from Verkister/ridewild 
Adds a verb for rideable mobs to toggle rider control without a riding crop
 2020-01-01 12:03:42 -05:00
Holdelta
53716a38b3 Update robot.dm 2019-12-31 22:32:56 -08:00
Holdelta
f8196681c7 Update robot.dm 2019-12-31 19:27:41 -08:00
Holdelta
ebd4a75584 Update robot.dm 2019-12-31 19:17:20 -08:00
Atermonera
0924159554 Merge pull request #6589 from Heroman3003/fruist-multispawn 
Allows admin spawning fruit in multiples
 2019-12-31 19:14:32 -05:00
Novacat
524ef9ee17 Merge pull request #6349 from Novacat/nova-basicfixes 
Misc Changes and bugfixes
 2019-12-31 18:39:10 -05:00
Novacat
a7551aea22 Merge pull request #6384 from Heroman3003/feral-bois 
Implements ferality indicator for xenochimera
 2019-12-31 11:43:51 -05:00
Novacat
df5b81c1b9 Merge pull request #6367 from lbnesquik/Kates-Taur-Clothes_3 
Introduce more taur clothes.
 2019-12-31 10:23:42 -05:00
Novacat
468e676779 Merge pull request #6325 from TheFurryFeline/TFF-Nose_Boopage! 
Boop Da Noses!
 2019-12-31 10:22:39 -05:00