cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 13:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,561 Commits 7 Branches 0 Tags
a1bb30ddf86e9e65cccfadf19ddb14f9518cddf3
Commit Graph

9993 Commits

Author SHA1 Message Date
Novacat
b9a1fa29d6 Merge pull request #5111 from Heroman3003/people-cant-have-nice-things 
Removes glucose autoinjectors from vendomats, makes Zaddat spawn with a bunch
 2019-04-27 22:49:53 -04:00
Novacat
76bf550299 Merge pull request #5146 from VOREStation/upstream-merge-6129 
[MIRROR] Allows liquidfoods to be eaten through protective gear
 2019-04-27 22:49:20 -04:00
Novacat
958a5b6645 Merge pull request #5142 from VOREStation/upstream-merge-6058 
[MIRROR] Removes umbrella permastuns. Adds wind mechanics.
 2019-04-27 22:42:42 -04:00
Atermonera
8f3f8ad80f Allows liquidfoods to be eaten through protective gear 2019-04-27 19:54:46 -04:00
Atermonera
31a79f0c28 Merge pull request #6068 from Mechoid/WhatWasWillBe 
Re-adds the Space Worm.
 2019-04-26 19:33:43 -04:00
Atermonera
9ea820fd7f Merge pull request #6058 from Neerti/permastuns_are_bad 
Removes umbrella permastuns. Adds wind mechanics.
 2019-04-26 19:32:29 -04:00
Novacat
18c63cfab6 Merge pull request #5100 from Novacat/nova-survival 
Tether Wilderness Adjustments
 2019-04-25 21:10:46 -04:00
Neerti
ad51d60531 Merge pull request #6131 from Heroman3003/nurse-two 
Fixes a typo in nurse spider ai code
 2019-04-25 17:02:30 -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
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
a28944dc48 Merge pull request #5126 from Heroman3003/placeholder-galore 
Cataloguer placeholders
 2019-04-22 23:20:09 -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
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
Heroman
727ecd39a8 Removes glucose autoinjectors from vendomats 2019-04-21 16:06:49 +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
aa463a12e1 Merge pull request #5093 from VOREStation/upstream-merge-6097 
[MIRROR] Fixes promethean mice lunchboxes
 2019-04-18 13:35:55 -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
30726b47d6 Starts work on Organs affecting Reagent Processing 2019-04-18 13:09:48 -04:00
Heroman
4e99bbe732 Fixes wheelchairs. For real. 2019-04-18 15:53:23 +10:00
Neerti
72b37df79e Merge pull request #6091 from Heroman3003/yes-ye-yess 
Fixes *yes
 2019-04-16 19:32:41 -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
Heroman
3565edde80 Fixes snakess being aggressive 2019-04-16 16:26:03 +10:00
Heroman
c238820f95 Fixes mob pathing for wilderness and V2 2019-04-15 07:56:52 +10: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
Neerti
69855383ac Merge pull request #6078 from Heroman3003/unbluespacing-vehicles 
Fixes resisting out of vehicles causing problems
 2019-04-14 02:30:32 -04:00
Neerti
6c3e327687 Merge pull request #6077 from Heroman3003/meson-runtime-fix 
Fixes glasses with overlays runtiming on clientless mobs
 2019-04-14 02:26:49 -04:00
Heroman
86766e26c0 Removes unnecesary var 2019-04-13 17:20:01 +10:00
Heroman
123cdfa395 Fixes notify transcore checking for presense of backup 2019-04-13 17:01:57 +10:00
Heroman
31ebde962c Forgot vorestation edits 2019-04-13 13:58:12 +10:00
Heroman
7604c8550d Allows help-intent step with buckled mobs 2019-04-13 12:30:47 +10:00
Novacat
65298da62a Merge pull request #5017 from Novacat/nova-survival 
Fixes #5016
 2019-04-12 12:30:23 -04:00
Novacat
0728d084c6 Merge pull request #5015 from Heroman3003/overtime-overtime-overtime-over 
Fixes runtime in announcer AI
 2019-04-12 12:28:55 -04:00
Unknown
1f94602c85 Fixes #5016 
Polaris code changes ended up being not compatable with vorestation stuff, this should correct that.
 2019-04-12 12:20:27 -04:00
Spades
16ee6b9221 Merge pull request #4897 from Heroman3003/bone-zone 
Added a remains option for digesty vore
 2019-04-12 09:11:04 -04:00
Spades
c5b6f7964f Merge pull request #4957 from Heroman3003/lower-respawn-timer 
Lowers respawn timer back to 1 minute
 2019-04-12 09:09:25 -04:00
Heroman
9e3ece47d2 Fixes runtime in announcer AI 2019-04-12 19:40:21 +10:00
Novacat
ab5710a015 Merge pull request #4881 from Heroman3003/borg-resization 
Borgs are now in on fun of size-related features
 2019-04-11 12:35:21 -04:00
Novacat
6012e37836 Merge pull request #4984 from Heroman3003/jello-equivalent-of-glass-bones 
Undoes some VOREStation promethean nerfs
 2019-04-11 12:33:49 -04:00
Novacat
c1d44a008a Merge pull request #4966 from Novacat/nova-survival 
Rosettes, radiopack sprites
 2019-04-10 19:46:09 -04:00