cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 02:23:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,394 Commits 7 Branches 0 Tags
aac3f800ba55fc1bf85861a58798f9bccfd9ff95
Commit Graph

34246 Commits

Author SHA1 Message Date
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
69cc49c009 Conflict Resolution 2019-04-18 13:44:38 -04:00
Atermonera
f986f56ec2 Changes way syringes interact with containers 2019-04-18 13:26:55 -04:00
Novacat
f878127d21 Merge pull request #5090 from VOREStation/upstream-merge-6103 
[MIRROR] Allows voidsuits to be modified in hands
 2019-04-18 13:25:18 -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
836fe2be2b Merge pull request #6100 from Heroman3003/silicate-fix 
Fixes silicate making fulltile windows invisible
 2019-04-18 13:09:37 -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
Novacat
ab7a0305f7 Conflict Resolution 2019-04-18 02:00:59 -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
860ff31f08 Merge pull request #6094 from Heroman3003/anti-magic-markers 
Fixes markers and crayons drawing from a distance
 2019-04-16 23:09:02 -04:00
Novacat
01a7f1083b Merge pull request #5080 from VOREStation/upstream-merge-6092 
[MIRROR] Fixes fireaxe cabinets
 2019-04-16 22:48:01 -04:00
Novacat
484cc3da23 Merge pull request #5079 from VOREStation/upstream-merge-6093 
[MIRROR] Fixes newly constructed vertical pipes being invisible
 2019-04-16 22:24:36 -04:00
Neerti
3f7d2a0450 Fixes fireaxe cabinets 2019-04-16 22:00:42 -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
Heroman3003
fed6680ddf Fixes cryopod not allowing people to change their mind 2019-04-17 11:25:56 +10: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
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
Novacat
beadac0ee3 Merge pull request #5062 from VOREStation/upstream-merge-6089 
[MIRROR] Fixes some signaler bugs
 2019-04-15 18:47:40 -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
b597e89447 Merge pull request #5064 from VOREStation/upstream-merge-6087 
[MIRROR] Fixes some bugs related to buckling
 2019-04-15 18:44:24 -04:00
Novacat
2fa26d319c Merge pull request #5063 from VOREStation/upstream-merge-6086 
[MIRROR] Fixes self-refueling welders starting fires when off
 2019-04-15 18:41:31 -04:00
Novacat
db882f5cfa Conflict Resolution 2019-04-15 18:37:41 -04:00
Neerti
88d095cf11 Merge pull request #6087 from Heroman3003/pipe-buckle-general 
Fixes some bugs related to buckling
 2019-04-15 18:32:51 -04:00
Neerti
197bedb2eb Merge pull request #6086 from Heroman3003/welder-fires 
Fixes self-refueling welders starting fires when off
 2019-04-15 18:31:37 -04:00
Neerti
01fdfe00e6 Fixes some signaler bugs 2019-04-15 18:30:15 -04:00
Neerti
99444fa0c8 Merge pull request #6085 from Heroman3003/apc-cost-fix 
Fixes apc frame giving more steel than needed
 2019-04-15 18:29:58 -04:00
Novacat
9ad8597a2f Merge pull request #5058 from Heroman3003/defunct-pto 
Removes Command PTO from appearing for players who had it
 2019-04-15 12:21:59 -04:00
Heroman
bc74ea53c9 Removes Command from appearing for players who had it removed 2019-04-15 18:14:04 +10: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
Novacat
47b47d001a Merge pull request #5056 from VOREStation/upstream-merge-6083 
[MIRROR] Fixes runtiming with mineral turfs
 2019-04-14 20:30:30 -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
Neerti
0c2703b705 Merge pull request #6082 from Heroman3003/sleeper-a-roo 
Fixes several issues with sleepers
 2019-04-14 19:55:20 -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
629748faec Merge pull request #5048 from VOREStation/upstream-merge-6065 
[MIRROR] Allows restriction of z-levels from spawning xenoarch finds
 2019-04-14 03:08:41 -04: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
c96e04bb24 Merge pull request #5051 from VOREStation/upstream-merge-6066 
[MIRROR] Allows the request console ID to actually be changed
 2019-04-14 03:02:29 -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