Commit Graph
411 Commits
Author SHA1 Message Date
QuoteFox 48cdd74808 Ridding crop sprite.
made a  ridding crop sprite. because it was using a chain before.
2020-11-09 15:27:51 +00:00
QuoteFoxandGitHub ef11319a43 Merge pull request #660 from ArchieBeepBoop/morguebeep
Morgue Coffins that have bodies with active ghosts can now alert medical.
2020-11-08 18:55:29 +00:00
DahlularandGitHub cce6202c50 Merge pull request #653 from Jay-Sparrow/Dynamic2
Dynamic tweaks and reworks and rebalances and oh god I've made such a terrible mess of everything oh fuck
2020-11-07 03:47:06 -07:00
Dip 38cce4ea40 a 2020-11-04 22:08:52 -03:00
Dip 7700545293 Morgue coffins can now be used by the ghosts of their bodies to alert medical for a revive. 2020-11-04 22:05:41 -03:00
JaySparrow 2abf3a7022 forgot one thing
meteors
2020-11-03 00:47:23 -06:00
JaySparrow d64ead68ac Merge branch 'master' into Dynamic2 2020-11-03 00:39:13 -06:00
JaySparrow 8d1ef78a58 buncha stuff
Hoo boy, lost power for a week, this should have been done so long ago
2020-11-03 00:35:55 -06:00
kevinz000andDip 3a84791e6c Merge pull request #9380 from Ghommie/Ghommie_cit212
refactoring and fixing altdisarm() exploits (ergo pushing people over directional windows etc).
2020-11-03 01:32:15 -03:00
DahlularandGitHub 996ad3b677 Merge pull request #645 from ArchieBeepBoop/giftfix
Gift Blacklist: The Electric Sequel
2020-11-02 20:54:20 -07:00
Dip c4680a7c28 the sequel 2020-11-02 15:01:08 -03:00
QuoteFoxandGitHub 164bff70bb Merge pull request #642 from ArchieBeepBoop/giftfix
Jacqueline and the Christmas tree no longer have the *tiny chance* to spawn narsie or a singulo or ratvar.
2020-11-02 09:33:48 +00:00
Dip 8916a47eac let's fucking NOT 2020-11-02 06:26:01 -03:00
DahlularandGitHub 02b0e4c690 Merge pull request #641 from Jay-Sparrow/Bug-fixin
FUCK YOU LONE OP
2020-11-02 01:40:20 -07:00
JaySparrow c033072884 FUCK YOU LONE OP
FUCK YOU FUCK YOU FUCK YOU FUCK YOU
2020-11-02 02:06:44 -06:00
Dip 2713df2455 makes revenants less shit tm 2020-11-01 22:15:41 -03:00
GhomandDip 28cdb9c5f1 Oh no. 2020-10-30 05:30:15 -03:00
DahlularandGitHub 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
Dip 9acf8ffd40 merge conflict drinks.dmi 2020-10-29 13:50:19 -03:00
kevinz000andDip 731b38c975 Merge pull request #9683 from Ghommie/Ghommie-cit303
Dullahans fixes and QoL.
2020-10-28 16:25:19 -03:00
kevinz000andDip fa655a1b78 Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2020-10-28 16:04:47 -03:00
kevinz000andDip 82daa9b75e Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3
Adds 8 more sci crates to cargo
2020-10-28 05:52:11 -03:00
kevinz000andDip 45f7b020c4 Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2020-10-28 05:48:57 -03:00
kevinz000andDip 071f1cc6af Merge pull request #9198 from Trilbyspaceclone/A_Tailer's_art
Code stuffs + more framework for cargo rework cuz atomic prs are good
2020-10-28 04:52:13 -03:00
kevinz000andDip 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
DahlularandGitHub 802208e969 Merge pull request #556 from ArchieBeepBoop/roddupe
Ladders are now Better Ladders(tm)
2020-10-24 23:17:44 -06:00
DahlularandGitHub 6ed7131b25 Merge pull request #611 from Kabramen/polisuit-fix
Fix PR #584 and some additions for lockers and kink vendor
2020-10-23 21:21:25 -06:00
Kabra_men fd44d1a9fd Fix PR #584 and some additions for lockers and kink vendor 2020-10-23 23:19:34 -03:00
Dip 5470fdd25c squashing some runtimes 2020-10-23 21:15:06 -03:00
Dip feaa0ecd24 double examine is a no no 2020-10-19 19:03:12 -03:00
Dip 9b7eee0a89 merge conflict 2020-10-18 16:54:22 -03:00
DahlularandGitHub d0d9927b96 Merge pull request #599 from ArchieBeepBoop/becomemodular
SHITCODE: BECOME MODULAR
2020-10-18 13:23:38 -06:00
DahlularandGitHub 441f1cd449 Merge pull request #600 from Jay-Sparrow/Dynamic2
More dynamic
2020-10-18 13:22:15 -06:00
DahlularandGitHub 7e05bf7e62 Merge pull request #591 from ArchieBeepBoop/durabelt2
Turns the Durathread Belt into a general belt for all main professions in terms of allowed items
2020-10-18 13:18:34 -06:00
Dip 6163b7c963 GRUG SMASH RUNTIME 2020-10-18 04:34:21 -03:00
Dip 6e8f722c27 runtime go YEET 2020-10-18 03:57:44 -03:00
kevinz000andDip 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
LinandDip 1fb7d6ff90 bloodbankfix 2020-10-17 23:25:39 -03:00
deathride58andDip cc26593463 Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
JaySparrow c3d33c363c Nukies
fix da nukie
2020-10-16 19:10:28 -05:00
JaySparrow c62d844273 More dynamic
Lone op, and lewd antag and a few other things because I forgot to switch branches.
2020-10-16 18:10:20 -05:00
Dip fa20d21b96 SHITCODE: BECOME MODULAR 2020-10-16 18:41:40 -03:00
QuoteFoxandGitHub 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
kevinz000andDip 6378761217 Merge pull request #10522 from Hatterhat/syndi-sleeper
printable syndicate sleepers - this is blackmajors fault im not gonna lie
2020-10-15 18:16:14 -03:00
Dip 110c2b512e holodeck buffers????? 2020-10-15 17:07:04 -03:00
Archie e20b215597 code fuck up 2020-10-14 17:25:53 -03:00
GhomandArchie d689ed02f5 Merge pull request #10781 from r4d6/RPD
RPD icon reorder, less building pixelhunting
2020-10-14 02:41:52 -03:00
kevinz000andArchie f6c62c57ba Merge pull request #10605 from r4d6/Layer
Port TG Layers updates and Freezer update
2020-10-14 02:34:25 -03:00
Archie 3f90f38f64 Belt 2020-10-14 00:58:56 -03:00