Commit Graph

229 Commits

Author SHA1 Message Date
Dahlular
ee0017721e Merge pull request #627 from ArchieBeepBoop/spooky
The Spookening: Ports Jacqueline the Pumpqueen event + Dullahan and subsequent Fixes
2020-10-29 22:51:07 -06:00
Dahlular
c567887a32 Merge pull request #628 from ArchieBeepBoop/cluwnereturn
Hard return on the cluwne if H is not the current_victim.
2020-10-29 22:48:50 -06:00
Dahlular
5f257c785b Merge pull request #629 from BoxyBoy/sizeCodeFixStuff
Size code examine text
2020-10-29 22:48:08 -06:00
BoxyBoy
f508e0557b Better explanations
Changes a couple of comments in the if/else statement to better explain what it's doing.
2020-10-29 22:34:54 -06:00
BoxyBoy
75f967bd88 Character Size Examine Text
Adds a line of examine text when examining a character and gives an aproximation of their height.
2020-10-29 21:55:42 -06:00
Dip
4d64275e84 HARD return 2020-10-30 00:04:59 -03:00
Dip
138b7a0aa0 this dullahan bullshit is going to make me kill myself 2020-10-28 16:29:53 -03:00
kevinz000
731b38c975 Merge pull request #9683 from Ghommie/Ghommie-cit303
Dullahans fixes and QoL.
2020-10-28 16:25:19 -03:00
kevinz000
fa655a1b78 Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2020-10-28 16:04:47 -03:00
kevinz000
2c7c66fc89 Merge pull request #9589 from Ghommie/Ghommie-cit259
Porting GetComponent macros removal, and few other updates.
2020-10-27 14:42:55 -03:00
Dip
a6ce59ec67 floor cluwne fix 2020-10-25 02:07:55 -03:00
Dip
124bf72657 more runtimes, fixes wrong gibs and blood 2020-10-24 02:23:06 -03:00
Dip
e162b8c36f fixes invisible skellingtons 2020-10-24 00:02:45 -03:00
Dip
5470fdd25c squashing some runtimes 2020-10-23 21:15:06 -03:00
Dahlular
3be0cb650a Merge pull request #607 from ArchieBeepBoop/becomemodular
Oh boy, it's another one of Archie's mini packs. - Energy Harvester, HoS Pet Port and a micro carp buff.
2020-10-23 16:25:53 -06:00
Dip
61fad3f3de debuff carps, dormammu has not accepted bargain 2020-10-23 19:18:03 -03:00
Dip
ddcf4e1434 Adds petting element to Lia and Cayenne, alongside mob holder. 2020-10-20 03:14:45 -03:00
Dip
9d8a729c51 Ports Lia / Micro Carp Buff? 2020-10-20 02:46:13 -03:00
Dip
9b7eee0a89 merge conflict 2020-10-18 16:54:22 -03:00
Dip
6163b7c963 GRUG SMASH RUNTIME 2020-10-18 04:34:21 -03:00
Dip
8a911e0064 RUNTIIIIME 2020-10-18 04:04:01 -03:00
kevinz000
2e75188a0b Merge pull request #9688 from Ghommie/Ghommie-cit306
Fixing gibspawner runtimes and improving them, how gruesome...
2020-10-18 00:03:22 -03:00
Dip
c91a106b0d fixes and runtimes 2020-10-17 23:55:40 -03:00
Dip
682eb7b9b6 gotta make sure this works yo 2020-10-17 22:25:29 -03:00
deathride58
cc26593463 Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
Dip
fa20d21b96 SHITCODE: BECOME MODULAR 2020-10-16 18:41:40 -03:00
QuoteFox
1c151faf05 Merge pull request #590 from ArchieBeepBoop/radiationfixes
Radiation runtime fix, collector balance tweak, Machinery Alt Click, jukeboxes finally work, turrets no longer target megafauna, etc
2020-10-16 12:32:49 +01:00
QuoteFox
cbfb5e5700 Merge pull request #593 from ArchieBeepBoop/medibottipping
Ports the Medbot Tipping Update, you monster.
2020-10-16 12:31:36 +01:00
kevinz000
c952c3ecff Upgrade able Medical bot and Floor bot as well! + Clean bot fix! (#12112)
* Misstake are now

* Still dosnt all work

* no more range upgrade it just dosnt work

* bithell

* a this
2020-10-15 01:56:47 -03:00
Dip
618175ab42 PAI redundancy 2020-10-15 00:10:39 -03:00
Dip
f0bf81cb1f Runtimes and balance 2020-10-13 06:10:12 -03:00
Dahlular
688617d631 Merge pull request #589 from ArchieBeepBoop/interfacefix2
No ID Insertion, Fire Alarms Fix, ORM Fix, Sleeper Reagent Upgrade, Volume Based Filters, 5x5 SM Fix (THE FIXENING™)
2020-10-13 00:21:59 -06:00
Dahlular
cb4d7f6cd9 Merge pull request #588 from Jay-Sparrow/Dynamic2
Dynamic fixes
2020-10-13 00:18:04 -06:00
kevinz000
8408c6669f Merge pull request #9882 from FestiveBall/Fersi
[READY] Allows addition of reagents to sleepers for injection and detection of failed organs (minor GUI tweak.)
2020-10-13 01:26:13 -03:00
JaySparrow
a661c1d42b Forgot the chaos level
aaaaa
2020-10-12 21:55:38 -05:00
JaySparrow
e536168d4f Changeling Fix
Size and clothesplosion
2020-10-12 18:04:56 -05:00
QuoteFox
92d1fbaf1f Merge pull request #570 from ArchieBeepBoop/enginemapfixes
Some map fixes + changes
2020-10-12 15:35:06 +01:00
Dip
06f95d9668 who the fuck thought this was a good idea 2020-10-10 23:13:47 -03:00
Dip
2381dd7504 belt + typo fix 2020-10-10 17:42:10 -03:00
ToonClyde
4cb2430518 Deer Rework 2020-10-09 02:16:08 -07:00
Ghom
779cc787a3 Merge pull request #10541 from Detective-Google/the-p-o-o-l
adds the POOL
2020-10-07 18:40:10 -03:00
Dahlular
107d47a1e8 Merge pull request #560 from ArchieBeepBoop/examinerefactor
Examine Code Refactor
2020-10-06 21:02:05 -06:00
Dip
aa7d47a23b Examine Code Refactor 2020-10-06 23:36:21 -03:00
Dip
460ccc2a7f Stop Catsplosion 2020-10-06 16:28:33 -03:00
Dahlular
c433514622 Merge pull request #555 from ArchieBeepBoop/mobholderefactor
Mob Holder fixes + Micro Grab Fix
2020-10-05 21:50:56 -06:00
Dahlular
62e59d9f95 Merge pull request #551 from ArchieBeepBoop/carpchanges
Space Carp Updates
2020-10-05 21:45:55 -06:00
Dip
18a97324d0 runtime 2020-10-05 11:48:11 -03:00
Lin
51d2913161 more refactor 2020-10-05 09:52:18 -03:00
Dip
d0e66f9bfe aaaaa 2020-10-05 00:48:20 -03:00
QuoteFox
631090cf04 Dynamic glidespeed
ported from yogstation
2020-10-05 03:58:10 +01:00