cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 14:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,833 Commits 7 Branches 0 Tags
178d04fdb2f27193848ce2b3b6bcafe185912d15
Commit Graph

24591 Commits

Author SHA1 Message Date
TheFurryFeline
fb2b7dc49c Allows Quick-NIFing for most staff 
Changelog Notes:

- Adds Quick NIF ability to those with R_MOD, R_DEBUG, R_EVENT, and R_FUN.
 2020-01-13 22:37:11 -05:00
Razgriz
6be7d7e75a Merge pull request #140 from CHOMPStation2/Razgriz1032-patch-17 
Update sprite_accessories_ch.dm
 2020-01-13 20:27:17 -07:00
Razgriz
5ce1acaf58 Merge pull request #138 from CHOMPStation2/Razgriz1032-patch-16 
Indent fix
 2020-01-13 20:22:43 -07:00
Razgriz
8d636ea4b0 Update sprite_accessories_ch.dm 2020-01-13 20:21:57 -07:00
Razgriz
e3b5cd6c0b Update tools.dm 2020-01-13 19:47:35 -07:00
Razgriz
1cfc6cc514 WHAT IS WRONG WITH YOU 
It won't freaking compile. This is the original file now. No mentions of resleeving sickness
 2020-01-13 19:43:11 -07:00
Razgriz
3cce0a1bfa Remove Resleeving Sickness 2020-01-13 19:25:26 -07:00
Razgriz
d3e875d753 Resleeving sickness removal 2020-01-13 19:07:27 -07:00
Razgriz
549929817e Remove Resleeving sickness 2020-01-13 19:04:55 -07:00
Razgriz
50609a9b1d Update machines.dm 2020-01-13 19:03:26 -07:00
Razgriz
715c056bb1 Remove sleeving cure 2020-01-13 18:55:11 -07:00
Razgriz
ff138d6b88 Remove sleeving cure 
As part of removing resleeving sickness
 2020-01-13 18:53:47 -07:00
Razgriz
de24521619 First merge from upstream 2020-01-13 17:23:01 -07:00
Razgriz
5e21c5b07f Shut up Travis 2020-01-13 14:36:42 -07:00
Razgriz
04a1aadfbe Merge pull request #136 from TheFurryFeline/patch-5 
Chomp-Specific Panel Save
 2020-01-13 13:42:58 -07:00
Hawk-v3
4623c3c1d1 Merge branch 'master' into master 2020-01-13 20:31:39 +00:00
Razgriz
b14866a20f Merge pull request #126 from Ketrai/master 
Refactors cakes, implements chaos cake proper.
 2020-01-13 13:30:28 -07:00
TheFurryFeline
ef567b9acc Chomp-Specific Panel Save 
Changelog Notes:

- Changes vore panel saving output to display Chompstation-specific, not Virgo.
 2020-01-13 15:18:00 -05:00
Hawk_v3
f641220882 Compilation fixing, and Phorochem depreciation fix. 
We should now be good to go! Praise Travis!
 2020-01-13 20:07:30 +00:00
Hawk_v3
6dcf1520b4 Let's get this wrapped up and ready to go. 
Removed all KHI references, and the Vore AI Law stuff.
 2020-01-13 19:38:10 +00:00
izac112
f093367c69 fixed stupid tab 2020-01-13 20:32:30 +01:00
izac112
097d8e8790 Removes the "Physical" sides of the sleeving sickness 
Aka the brute, burn, pain and melee damage modifiers.

Signed-off-by: izac112 <izac10@live.com>
 2020-01-13 20:29:07 +01:00
izac112
8423b036b8 Reduces duration to 25 minutes on a un-upgraded machine 2020-01-13 20:27:24 +01:00
izac112
5713226986 Vore death or not should be the same 2020-01-13 20:19:18 +01:00
Hawk_v3
33c345c34a Fixing lists for merge. 
Missing commas, man.
 2020-01-13 18:45:44 +00:00
Hawk_v3
ba05f70db6 Merge remote-tracking branch 'upstream/master' 2020-01-13 18:37:42 +00:00
Novacat
d7962d0448 Merge pull request #6441 from Heroman3003/droppodfix 
Fixes droppod spawning wrong subtype
 2020-01-13 09:10:04 -05:00
Heroman3003
9e31d82dd5 Decreases chance 2020-01-13 18:16:46 +10:00
Heroman
f032c80486 Also buffs vore laws chance for lost voreborgs 2020-01-13 17:55:00 +10:00
Heroman
737d37321b Fixes droppod spawning wrong subtype 2020-01-13 17:48:33 +10:00
Novacat
fcd8fd1370 Merge pull request #6440 from Heroman3003/droppodfix 
Fixes drone droppod not being announced
 2020-01-13 02:04:30 -05:00
Heroman
aa53bdc0ed Fixes drone droppod not being announced 2020-01-13 16:51:12 +10:00
Novacat
c1a52de67b Merge pull request #6438 from Heroman3003/dronefix 
Makes drone age restriction based on config setting too
 2020-01-13 01:37:11 -05:00
Heroman
4551f97924 Makes drone age restriction based on config setting too 2020-01-13 14:56:27 +10:00
Razgriz
271b293a63 Merge pull request #131 from CHOMPStation2/Sharkmare-Drone++ 
Assembly (Drone) buff
 2020-01-12 21:41:26 -07:00
Razgriz
3f56b514e4 Merge pull request #129 from CHOMPStation2/Sharkmare-patch-Circuit 
Fixing the can hold list of the circuit bag again
 2020-01-12 21:41:09 -07:00
Razgriz
fc29f80132 Merge pull request #121 from CHOMPStation2/Sharkmare-🥚 
🥚
 2020-01-12 21:40:47 -07:00
Novacat
105f13e03c Merge pull request #6424 from drexample/gnot-sure 
You've been gnomed.
 2020-01-12 22:02:41 -05:00
Hawk_v3
c51046191b Merge remote-tracking branch 'upstream/upstream-merge-6623' 2020-01-13 00:02:11 +00:00
Hawk_v3
20596d9787 Merge remote-tracking branch 'upstream/master' 2020-01-13 00:01:47 +00:00
Atermonera
b262b4ac96 Merge pull request #6623 from Heroman3003/radfix 
Fixes calculation of wall rad resistance
 2020-01-12 18:18:17 -05:00
Sharkmare
9c205d085c DME 2020-01-12 23:43:09 +01:00
Novacat
0a58fb115c Merge pull request #6433 from Heroman3003/dronelimit 
Adds a timegate on playing maintenance drones
 2020-01-12 17:03:43 -05:00
Sharkmare
8653f939b3 Rideable borgs 2020-01-12 22:35:19 +01:00
Heroman
de03c4e3e3 Adds a timegate on playing maintenance drones 2020-01-13 06:19:10 +10:00
Repede
17d336009e Merge branch 'master' into Holdelta-RPD-Addition 2020-01-12 14:57:03 -05:00
Repede
e671d2d799 Merge branch 'master' into Howl'n 2020-01-12 14:36:47 -05:00
Repede
2d453d354b Merge branch 'master' into Holdelta-RPD-Addition 2020-01-12 14:36:25 -05:00
Sharkmare
edad5a6d89 woop 2020-01-12 19:29:31 +01:00
Sharkmare
5b4321cb1f Assembly (Drone) buff 
Upgrades drone assembles to be between medium and large assembly size.
As it currently stands all you can make with drone assemblies really is meme shit and nothing that would actually be beneficial, unless you remove the locomotion circuit at which point you can just use an unmovable large assembly.

Assemblies could use an overhaul in general but this is the biggest flaw.
 2020-01-12 19:22:12 +01:00