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,515 Commits 8 Branches 0 Tags
f21c5e44306ec69bd3b83a3b7dd09c390d4bfcd6
Commit Graph

34312 Commits

Author SHA1 Message Date
Unknown
f21c5e4430 Adds Subtle Teleporter 
It is also a structure, which should make it easier to use in buildmode. Current uses vanilla portal sprite.
 2019-04-24 20:20:51 -04:00
Anewbe
b01c0bb40c Merge pull request #6126 from Heroman3003/phoronguard 
Fixes some items having item_flag PHORONGUARD
 2019-04-24 17:13:17 -04:00
Novacat
3d4333a405 Merge pull request #5132 from Novacat/nova-aifixes 
Adds hostile NPC shadekin
 2019-04-24 16:36:38 -04:00
Novacat
69d2d01c02 Conflict Resolution 2019-04-24 15:36:07 -04:00
Atermonera
44fd128ec5 Xenobio Slimes Grudge Promethean Attackers 2019-04-24 15:30:43 -04:00
Unknown
57f92df2ea Adds hostile NPC shadekin 
By staff request.
 2019-04-24 13:00:33 -04:00
Novacat
6ad6879574 Merge pull request #5130 from Heroman3003/a-kin-fixing 
Fixes shadekin feeling the burn
 2019-04-24 11:50:43 -04:00
Novacat
37ede97410 Merge pull request #5131 from Heroman3003/micromaking 
Fixes gripper being unable to hold micromech parts
 2019-04-24 11:50:29 -04:00
Heroman
7c3181e599 Fixes gripper being unable to hold micromech parts 2019-04-24 20:53:17 +10:00
Heroman
5a93f11054 Fixes shadekin feeling the burn 2019-04-24 19:36:45 +10:00
Novacat
cd022ca990 Merge pull request #5113 from Heroman3003/ka-holsters 
Adds KA holster to mining vendor
 2019-04-24 01:27:58 -04:00
Neerti
c054354fb0 Merge pull request #6130 from Heroman3003/gamemode-fixes 
Fixes gamemode checking list itself, instead of entries
 2019-04-23 05:21:19 -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
Novacat
23200456b2 Merge pull request #5124 from VOREStation/upstream-merge-6114 
[MIRROR] Makes gamemode player requirements be able to be overridden in the config
 2019-04-22 14:52:42 -04:00
Novacat
86bc934745 Merge pull request #5123 from VOREStation/upstream-merge-6117 
[MIRROR] Hides AI Shells from the manifest.
 2019-04-22 14:52:20 -04:00
Atermonera
6cb44efd10 Merge pull request #6114 from Neerti/gamemode_config 
Makes gamemode player requirements be able to be overridden in the config
 2019-04-22 14:33:38 -04:00
Atermonera
9152030002 Merge pull request #6117 from Neerti/ai_shell_manifest_fix 
Hides AI Shells from the manifest.
 2019-04-22 14:31:22 -04: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
207775b2a7 Merge pull request #5119 from VOREStation/upstream-merge-6124 
[MIRROR] Fixes message on window frame fastening
 2019-04-22 01:27:19 -04:00
Novacat
2d403d518d Merge pull request #5118 from VOREStation/upstream-merge-6125 
[MIRROR] Fixes ability to deconstruct fire alarms
 2019-04-22 01:27:05 -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
cbb56b0546 Merge pull request #6124 from Heroman3003/window-message-fix 
Fixes message on window frame fastening
 2019-04-22 00:29:26 -04:00
Neerti
7a66fc1854 Merge pull request #6125 from Heroman3003/fire-alarm-deconstruction 
Fixes ability to deconstruct fire alarms
 2019-04-22 00:29:16 -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
Atermonera
6dc9f9a946 Merge pull request #6102 from Heroman3003/taping-it-all-up 
Fixes taperolls not being usable on tiles with directional windows
 2019-04-20 20:28:00 -04:00
Neerti
90e2d35db0 Merge pull request #6112 from Heroman3003/unredundanting 
Removes redundant fix for a bug that never existed
 2019-04-20 13:55:08 -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
94b7ef33bb Merge pull request #5098 from VOREStation/upstream-merge-6109 
[MIRROR] Makes transfer always occur if nobody is playing.
 2019-04-18 14:00:45 -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
557a36e2e5 Conflict Resolution 2019-04-18 13:47:28 -04:00