cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,961 Commits 10 Branches 0 Tags
b3b51a7c3a57eccbf09db457c1faf8b38aa2324d
Commit Graph

23794 Commits

Author SHA1 Message Date
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
Heroman
e2cd78159d removes unnecessary 0's 2019-12-31 20:36:43 +10:00
Heroman
89636b06c5 Adjusts the sickness values 2019-12-31 20:33:40 +10:00
Heroman
e21ac7d522 _vr 2019-12-31 15:42:15 +10:00
TheFurryFeline
50adcea491 Blep 
Big chunka text surrounded by Vorestation edit
 2019-12-30 16:41:02 -05:00
TheFurryFeline
8a63f28c78 Comment Consistency 2019-12-30 10:50:32 -05:00
lbnesquik
377723bcf4 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes 2019-12-30 09:09:51 +01:00
Heroman
8f6878e6db Implements ferality indicator for xenochimera 2019-12-30 10:22:57 +10:00
Novacat
f2fb0d9f6a Merge pull request #6360 from Ketrai/sharksbranch 
Adds a new fish, measelsharks!
 2019-12-29 15:11:46 -05:00
Heroman
f8e2e7bf19 Removes bleeding rate debuff from resleeving sickness 2019-12-30 06:02:07 +10:00
Heroman
d7a7110b94 Rebalances time calculation for sickness. 45 new maximum, 30 still a median, 15 still a minimum 2019-12-30 05:18:29 +10:00
Unknown
64b4d435f9 Joan's spacesuit no longer NORMAL size 2019-12-29 11:26:37 -05:00
Unknown
7aeb10d1e8 Nerfs ADG health too 2019-12-29 11:03:35 -05:00
Unknown
6faf4fdea3 Nerfs Gygax tesla zap 2019-12-29 10:52:08 -05:00
Novacat
0ba0682c08 Merge pull request #6382 from VOREStation/upstream-merge-6587 
[MIRROR] Allows to set department names on fax machines
 2019-12-29 09:07:00 -05:00
Heroman
6eff7bd443 Undoes the speed buff for the printer (keeps the healthcap removal) 2019-12-29 20:21:16 +10:00
Heroman3003
f1c23c4f5a Allows to set department names on fax machines (#6587) 2019-12-29 02:44:04 -05:00
Verkister
f5e02b9b23 Fixes chairs acting as handcuffs. (#6588) 
* Fixes chairs/beds/etc acting as handcuffs.

It's been at least 7 years without anyone noticing a broken feature with a false comment so the unintentional "balancing" caused by this may have ingrained a standard some folks would rather keep in, but that kind of nerfs have proper ways of implementing at their own appropriate places in the code.

Basically this just lets folks use hands when buckled. May also have a side effect of allowing self-surgery if it never had a proper prevention method implemented. Keeps an exception for xeno nests tho. Any other seat has no reason to be handcuffs.

* Fixes another thing causing chairs to incapacitate

"Are you seated" and "Are you incapacitated" should not be used as the same thing yet here we are.

I should probably also do a refactor to remove all the inappropriate use of canmove var. Seriously, even the specifically cartridge exclusive PDA menu buttons are using that for what???
 2019-12-29 02:42:50 -05:00