cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 05:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,502 Commits 7 Branches 0 Tags
cd022ca9904fefe69e18bf07a07893dc67ca8f74
Commit Graph

22474 Commits

Author SHA1 Message Date
Novacat
cd022ca990 Merge pull request #5113 from Heroman3003/ka-holsters 
Adds KA holster to mining vendor
 2019-04-24 01:27:58 -04:00
Novacat
a28944dc48 Merge pull request #5126 from Heroman3003/placeholder-galore 
Cataloguer placeholders
 2019-04-22 23:20:09 -04:00
Novacat
d252f8d857 Merge pull request #5121 from Novacat/nova-aifixes 
Halves damage from voremobs
 2019-04-22 23:19:43 -04:00
Novacat
b13fadf424 Update otie.dm 2019-04-22 22:21:08 -04:00
Novacat
689b970f84 Update frog.dm 2019-04-22 22:20:38 -04:00
Novacat
5adb279757 Update dino.dm 2019-04-22 22:20:22 -04:00
Heroman3003
e3e715454b Makes placeholder entries for lore writing 2019-04-23 11:13:42 +10:00
Atermonera
eff39e3366 Merge pull request #6123 from Mechoid/OneDayIllBeAGoodDev 
Marble ore [Exists] again.
 2019-04-22 14:30:03 -04:00
Unknown
08b26b9bd8 Overlooked mobs 2019-04-22 03:17:32 -04:00
Unknown
ee09299293 Halves damage from voremobs 
12:23 AM] Neerti: Did Virgo not halve the damage of their mobs when coverting to the new AI system?

WHOOPS!
 2019-04-22 03:12:00 -04:00
Novacat
6f67b1f902 Merge pull request #5120 from VOREStation/upstream-merge-6115 
[MIRROR] Sterilizine Hurts Slimes
 2019-04-22 01:35:26 -04:00
Novacat
85711f77dc Merge pull request #5117 from VOREStation/upstream-merge-6105 
[MIRROR] Fixes borgs being unable to use ladders
 2019-04-22 01:26:46 -04:00
Neerti
d9a7b5705c Merge pull request #6115 from Mechoid/SterilizineTheThinkingXenobiologistsWeapon 
Sterilizine Hurts Slimes
 2019-04-22 01:25:15 -04:00
Neerti
9df9e135a6 Merge pull request #6105 from Heroman3003/climbybois 
Fixes borgs being unable to use ladders
 2019-04-22 00:28:01 -04:00
Neerti
2ffe390346 Merge pull request #6116 from Mechoid/WhyAmIStupid 
God damnit past me.
 2019-04-22 00:27:50 -04:00
Heroman
fef914b3bd Adds KA holster to mining vendor 2019-04-22 06:47:55 +10:00
Novacat
ff8f22ad94 Merge pull request #5108 from VOREStation/upstream-merge-6107 
[MIRROR] Adds Config-Controlled Automated Solar Setup
 2019-04-21 11:45:37 -04:00
Novacat
982db3fb50 Merge pull request #5109 from Heroman3003/hewwo-give-mask-back 
Fixes gasmasks on human sprites appearing wrong
 2019-04-21 11:45:15 -04:00
Heroman
41f726ee8f Fixes gasmasks on human sprites appearing wrong 2019-04-21 17:55:28 +10:00
Neerti
40e5fda9ca Adds Config-Controlled Automated Solar Setup (#6107) 
* Fixes autostart solars, adds new config-controlled solars.

* Tweaks map to use config-controlled solar panels, and makes it work.

* If true, Neerti finishes comment.
 2019-04-21 03:34:25 -04: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
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