Commit Graph

59 Commits

Author SHA1 Message Date
DragonTrance
67e365cd1f port tgstation/tgstation#52417 2022-11-11 09:30:41 -05:00
Dahlular
f45b4bfb4c MultiZ Layenia Base 2022-09-04 10:32:31 -06:00
Dahlular
b487573064 Revert "Finally, MultiZ Layenia" 2022-07-09 13:52:49 -06:00
ToonClyde
6ef34f0f02 New tool vending machine textures and others 2022-04-11 18:24:25 -07:00
ToonClyde
784a20e02c Lots of cool things 2022-04-11 01:28:41 -07:00
Dahlular
e8582ce39e barber and barista base 2022-04-05 00:15:11 -06:00
Dahlular
784999b48b Merge remote-tracking branch 'upstream/master' into fairylights 2022-04-02 18:43:01 -06:00
Dahlular
48dd9fa7af Lambent Framework 2022-03-12 11:10:39 -07:00
TotallyNotADog
3fe5a2c6ff removes grilles from maint loot rolls 2022-02-15 23:11:11 -06:00
Moltov
fc810abcaa fixes MORE 2021-10-21 22:31:07 -04:00
Archie
573b074ac3 Bluespace Anomaly Changes 2021-07-22 23:55:52 -03:00
kevinz000
470cb0a588 Merge pull request #9587 from Ghommie/Ghommie-cit258
Porting components updates and fixing phantom thief component.
2021-06-25 21:06:34 -03:00
quotefox
8001a3ef1c New glitter animation 2021-06-15 09:18:29 +01:00
Lin
a5cf94ab29 Merge pull request #10212 from Ghommie/Ghommie-cit471
Ports some hud and update_icon code updates.
2021-06-04 15:23:40 -03:00
Archie
266fafeaa2 Radiation flags and dissipation fix 2021-06-02 01:33:35 -03:00
QuoteFox
a4826e6eab Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit f5cf7f6f5a, reversing
changes made to a32444dae7.
2021-03-27 10:56:34 +00:00
QuoteFox
a1644811ac Ported Map; Lambda Station 2021-03-25 12:06:32 +00:00
Chloe Carver-Brown
0620b5c682 psych job! 2021-03-23 17:21:44 +00:00
QuoteFox
706ee6d3eb Hyperstation RP beta 0.1 and alot of bug fixes. 2021-03-20 12:36:02 +00:00
nik707
858f994b5d Adds: The Chad Plasmaglass Table 2021-01-21 02:44:06 -03:00
Archie
87ce4d858c Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""
This reverts commit 08c8f744a9.
2021-01-08 17:03:24 -03:00
QuoteFox
08c8f744a9 Revert "Merge pull request #838 from ArchieBeepBoop/test1"
This reverts commit b0dbacee82, reversing
changes made to 813a2ea1c7.
2021-01-08 19:28:18 +00:00
kevinz000
939d8258de Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
2021-01-08 07:11:56 -03:00
BlackMajor
4b8b03fea0 Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled. 2021-01-05 16:32:02 -03:00
kevinz000
7f2de64be7 RCD Update Sync 2021-01-04 18:13:02 -03:00
Ghom
0c8ed89992 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
Cleanup/Partial revert of RGB blood ""rework""
2020-12-25 17:30:06 -03:00
Lin
a7c539ac32 Ports reagents id removal and typepath usage. 2020-12-09 14:32:36 -03:00
Dahlular
ec85829dca Merge pull request #725 from Oposshim/another-nanotrasen-muh-lore-tweak
Posshim's fix - of a fix - of a fix - of a fix
2020-11-30 09:49:21 -07:00
Oposshim
c8cf5e2fb7 Posshim's fix - of a fix - of a fix - of a fix
I cannot be trusted with PRs.

I missed / messed up two things from the last pull.
2020-11-30 11:30:55 -05:00
Dahlular
0884fc0f66 Merge pull request #704 from ArchieBeepBoop/dummyruntimes
I'M FIXING THESE RUNTIMES, WITH NO SURVIVORS.
2020-11-21 23:03:08 -07:00
Dip
f2bf2235c3 ahem 2020-11-21 03:05:32 -03:00
Dip
ccd2d137b7 Fixes some dummy thicc runtimes 2020-11-21 03:03:27 -03:00
Dip
a2089ee778 Adds a radioactive type of greenglow cleanable decal 2020-11-17 22:53:42 -03:00
Ghom
28cdb9c5f1 Oh no. 2020-10-30 05:30:15 -03:00
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
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
5470fdd25c squashing some runtimes 2020-10-23 21:15:06 -03: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
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
deathride58
cc26593463 Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
Archie
e20b215597 code fuck up 2020-10-14 17:25:53 -03:00
Dip
aa7d47a23b Examine Code Refactor 2020-10-06 23:36:21 -03:00
kevinz000
b8bc551d51 Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-10-03 19:35:47 -03:00
Dip
5ea7b7a4d6 IT LIVES 2020-09-27 15:32:40 -03:00
Putnam3145
c983e3662b a 2020-09-27 14:33:13 -03:00
kevinz000
0f750932e2 playing with fire will get me roasted 2020-09-25 13:13:29 -03:00
Dip
72c8e681e3 runtimev1-experimental 2020-09-22 16:37:51 -03:00