cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,680 Commits 8 Branches 0 Tags
27565f4da99fed5a814593f647fb59b4375c7f93
Commit Graph

22558 Commits

Author SHA1 Message Date
Heroman
727ecd39a8 Removes glucose autoinjectors from vendomats 2019-04-21 16:06:49 +10:00
Heroman
b077e747f2 more commenting 2019-04-21 15:16:26 +10:00
Heroman
ebe96f79b2 Reenables solargrub files 2019-04-21 11:42:14 +10:00
Neerti
1cb351e0bf Merge pull request #6119 from Heroman3003/sticky-substance 
Fixes nurse spiders getting stuck in infinite loop
 2019-04-20 04:22:28 -04:00
Novacat
17eadd4444 Merge pull request #5069 from Sebbe9123/mobpathfix 
Hopefully fixes all paths here and there
 2019-04-18 18:50:33 -04:00
Sebbe
9f5e176cd0 unedits thing as requested 2019-04-18 23:54:56 +02:00
Unknown
a5df38c370 Tether Wilderness Adjustments 
- Adds Geese (and Gaslamps)
- Adjusts mob spawns on some POIs
- Adds Air canisters to structures with primitive airlocks
 2019-04-18 17:35:54 -04:00
Novacat
49e8fa5487 Merge pull request #5096 from VOREStation/upstream-merge-6096 
[MIRROR] Changes way syringes interact with containers
 2019-04-18 14:02:51 -04:00
Novacat
aac3f800ba Update syringes.dm 2019-04-18 13:53:34 -04:00
Novacat
8e93b70bb6 Update syringes.dm 2019-04-18 13:51:08 -04:00
Novacat
358b7023f2 Merge pull request #5097 from VOREStation/upstream-merge-6099 
[MIRROR] Fixes fortune cookie recipe runtime
 2019-04-18 13:48:13 -04:00
Novacat
0795bb7e3e Merge pull request #5094 from VOREStation/upstream-merge-6090 
[MIRROR] Hopefully fixes ghost presence checks.
 2019-04-18 13:45:16 -04:00
Novacat
69cc49c009 Conflict Resolution 2019-04-18 13:44:38 -04:00
Novacat
aa463a12e1 Merge pull request #5093 from VOREStation/upstream-merge-6097 
[MIRROR] Fixes promethean mice lunchboxes
 2019-04-18 13:35:55 -04:00
Novacat
f3a8a78321 Merge pull request #5089 from VOREStation/upstream-merge-6081 
[MIRROR] Starts work on Organs affecting Reagent Processing
 2019-04-18 13:30:18 -04:00
Atermonera
10d196de89 Merge pull request #6099 from Heroman3003/fcookie-runtime-fix 
Fixes fortune cookie recipe runtime
 2019-04-18 13:28:13 -04:00
Atermonera
f986f56ec2 Changes way syringes interact with containers 2019-04-18 13:26:55 -04:00
Atermonera
1fa82e6900 Merge pull request #6090 from Mechoid/Hopefully_Fixes_Ghost_Checks 
Hopefully fixes ghost presence checks.
 2019-04-18 13:23:24 -04:00
Atermonera
daf498ccbb Merge pull request #6097 from Heroman3003/mice-for-goo 
Fixes promethean mice lunchboxes
 2019-04-18 13:22:07 -04:00
Novacat
cf0896f904 Update modifiers_misc.dm 2019-04-18 13:11:11 -04:00
Atermonera
d98a0726d2 Merge pull request #6103 from Heroman3003/convinienct-suiting 
Allows voidsuits to be modified in hands
 2019-04-18 13:11:06 -04:00
Atermonera
30726b47d6 Starts work on Organs affecting Reagent Processing 2019-04-18 13:09:48 -04:00
Novacat
6a287c7e1f Merge pull request #5085 from VOREStation/upstream-merge-6026 
[MIRROR] Precursotech Janus
 2019-04-18 02:19:31 -04:00
Novacat
93487db857 Merge pull request #5087 from Heroman3003/fix-the-wheelchairs-for-real 
Fixes wheelchairs. For real.
 2019-04-18 02:04:25 -04:00
Heroman
4e99bbe732 Fixes wheelchairs. For real. 2019-04-18 15:53:23 +10:00
Mechoid
fc43527ac7 Adds Robobags (#6059) 
* Adds Robobags

* Finishes robobags

* FixFix
 2019-04-18 01:40:39 -04:00
Atermonera
b7e9934206 Precursotech Janus 2019-04-18 00:33:20 -04:00
Layla Crosse/Occula Drenn
dde5133e03 Research QoL changes (#6042) 
* Research QoL changes

* Reverts changes relating to blanket print times and Protolathe storage

* Actually changes the design print time.

Why do you hate me github.

* Fixes an enter key error caused by the editor.

* Actually does all of the things I needed to do like a smart person

Which apparently I am not.

* Fixes a newline

Because goddamn it the online editor hates me too.
 2019-04-17 04:51:29 -04:00
Neerti
f15c5bf29b Merge pull request #6095 from Heroman3003/unduping-synths 
Fixes synthesisers inserting more materials than they had
 2019-04-17 02:36:46 -04:00
Neerti
fee131b612 Merge pull request #6093 from Heroman3003/zpipe-fix 
Fixes newly constructed vertical pipes being invisible
 2019-04-16 22:00:31 -04:00
Neerti
72b37df79e Merge pull request #6091 from Heroman3003/yes-ye-yess 
Fixes *yes
 2019-04-16 19:32:41 -04:00
Heroman3003
d4d08be880 Fixes harpoon targeting obstructed tiles 2019-04-17 09:11:59 +10:00
Layla Crosse/Occula Drenn
9dcb5cbadb Add files via upload 2019-04-16 13:52:21 -04:00
Sebbe
1cf7fa2d69 Merge branch 'master' into mobpathfix 2019-04-16 11:39:01 +02:00
Sebbe
224ce6582b Hopefully fixes every path 
plz game, I didn't have fun ;w;
 2019-04-16 10:41:04 +02:00
Novacat
40a71fd240 Merge pull request #5068 from Heroman3003/cool-the-snek 
Fixes snakes being aggressive
 2019-04-16 02:48:30 -04:00
Heroman
3565edde80 Fixes snakess being aggressive 2019-04-16 16:26:03 +10:00
Novacat
a6d512e502 Merge pull request #5067 from Heroman3003/mothing-around 
Fixes moth antennae+wing combo not being colorable
 2019-04-16 01:57:07 -04:00
Heroman3003
fd263013ed Fixes moth antennae+wing combo not being colorable 2019-04-16 12:42:29 +10:00
Novacat
160e2ca8cb Merge pull request #5065 from VOREStation/upstream-merge-6088 
[MIRROR] Fixes money duping bug
 2019-04-15 18:55:54 -04:00
Neerti
b628f6e3d2 Merge pull request #6088 from Heroman3003/infinite-cash-no 
Fixes money duping bug
 2019-04-15 18:47:33 -04:00
Novacat
db882f5cfa Conflict Resolution 2019-04-15 18:37:41 -04:00
Neerti
01fdfe00e6 Fixes some signaler bugs 2019-04-15 18:30:15 -04:00
Novacat
880fd9f263 Merge pull request #5054 from Heroman3003/mob-pathfix 
Fixes mob pathing for wilderness and V2
 2019-04-15 02:38:20 -04:00
Neerti
3b2c4c5271 Merge pull request #6083 from Heroman3003/runtime-lead-sand-whatever 
Fixes runtiming with mineral turfs
 2019-04-14 19:56:33 -04:00
Heroman
c238820f95 Fixes mob pathing for wilderness and V2 2019-04-15 07:56:52 +10:00
Heroman
f6586554b1 Fixes moving items downstairs, virgo edition 2019-04-15 04:19:09 +10:00
Novacat
84398845db Merge pull request #5052 from VOREStation/upstream-merge-6080 
[MIRROR] Fixes My Idiocy
 2019-04-14 03:07:15 -04:00
Novacat
f9bfe5681f Merge pull request #5049 from VOREStation/upstream-merge-6078 
[MIRROR] Fixes resisting out of vehicles causing problems
 2019-04-14 02:58:08 -04:00
Novacat
47a473574e Merge pull request #5046 from VOREStation/upstream-merge-6077 
[MIRROR] Fixes glasses with overlays runtiming on clientless mobs
 2019-04-14 02:52:13 -04:00