ec28d0f66d
Line ending conflict fix
2021-01-21 02:45:10 -03:00
858f994b5d
Adds: The Chad Plasmaglass Table
2021-01-21 02:44:06 -03:00
75eb4d5696
New chairs and recipes!
...
New chairs and recipes!
2021-01-21 01:20:12 +00:00
8ece699ed9
Merge branch 'master' into punishesarchie
2021-01-19 06:30:10 -03:00
f21db73775
fuck yeah
...
banana
2021-01-19 03:31:33 -03:00
f806ffd48b
Merge pull request #891 from ArchieBeepBoop/cargo5
...
Small cargo crate revamp + QoL changes
2021-01-17 08:46:25 +00:00
7264218dca
Alien Furniture
2021-01-16 22:57:45 -03:00
3fa4bf8007
Allows borgs and drones to interact with tank dispensers
2021-01-16 18:38:45 -03:00
12fde70d0c
Cargo Changes Initial
2021-01-16 17:40:43 -03:00
157c3722ac
no longer shitcode
2021-01-12 00:59:24 -06:00
80d37a88ae
Fixes ghost role text all around
2021-01-10 12:13:31 -03:00
c164b52b30
Merge remote-tracking branch 'upstream/master' into nexties2
2021-01-08 15:20:47 -03:00
78da9a5a12
Merge branch, update to current
2021-01-08 07:26:35 -03:00
939d8258de
Merge pull request #10813 from Ghommie/Ghommie-cit540
...
Unicode support updates from tgstation.
2021-01-08 07:11:56 -03:00
625b35b8cb
Merge pull request #9755 from Ghommie/Ghommie-cit331
...
lentext to length, yet another 513 requirement.
2021-01-05 17:39:10 -03:00
5d80346f8f
Merge pull request #9993 from Ghommie/Ghommie-cit412
...
Ports tgstation loom changes, and durathred golems.
2021-01-05 16:54:23 -03:00
0db5aed986
Merge pull request #10056 from Ghommie/Ghommie-cit430
...
Ports "Slightly improves visible and audible messages."
2021-01-05 16:51:22 -03:00
9e37d3be62
Fix merge conflicts
2021-01-05 03:41:08 -03:00
b0779fe2d7
Merge pull request #9983 from Ghommie/Ghommie-cit408
...
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2021-01-05 01:34:16 -03:00
291dcf9515
Merge pull request #10575 from Arturlang/TGUIs_Nexties
...
[TESTMERGE] Properly working TGUI Next
2021-01-04 19:47:54 -03:00
bf1e84193a
Merge pull request #807 from DragonTrance/deconstructing
...
loom slapping fix
2021-01-03 05:42:17 +00:00
e83cf212c1
loom slapping fix
2021-01-02 13:11:04 -07:00
092a7fa5a1
Merge pull request #804 from quotefox/sexhud
...
New HTML arousal hud, with contextal options, plus new lewd features.
2021-01-02 14:34:31 +00:00
a9575ffc21
Merge pull request #794 from lyricalpaws/master
...
Let synthliz and IPC have and be infected by nanites
2021-01-02 14:02:24 +00:00
333f410476
New Arousal Hud
...
New Arousal Hud, much more user accessable with contextal options.
2021-01-02 13:39:17 +00:00
f27bafe721
barsign meow mix fix
2021-01-01 12:30:40 -07:00
c2a937bb73
Changing Nanotrasen to Kinaris where needed
2020-12-31 17:58:25 +00:00
9068e9c580
Update loom.dm
2020-12-25 14:14:52 -07:00
162ae674c6
constructible showers, loom, sinks & barrels now deconstruct
...
Deconstruction:
Loom - Screwdriver
Wooden Barrel - Screwdriver
Sink - Wrench
Shower - Screwdriver > Wrench
Securing:
Loom - Wrench
Wooden Barrel - Wrench
Shower - Screwdriver
Adds showers as craftable objects when using metal sheets. Also organizes some things in the metal sheet crafting menu
2020-12-25 13:22:21 -07:00
e6a7a295d2
Wash cum bug again
...
Muliple stacks break it..
2020-12-24 19:39:41 +00:00
48ede22c46
Merge remote-tracking branch 'upstream/master' into reagentsagain
2020-12-18 01:20:57 -03:00
e19743a4a7
Update ghost_role_spawners.dm
2020-12-10 02:48:03 -03:00
a7c539ac32
Ports reagents id removal and typepath usage.
2020-12-09 14:32:36 -03:00
ad8a067015
agonyyyy
2020-12-01 18:09:00 -03:00
6645e50dad
Merge pull request #694 from ArchieBeepBoop/improvements
...
ATMOS Firelocks and more
2020-11-21 22:54:02 -07:00
7a8fcf77d4
ATMOS Firelocks and more
2020-11-19 11:04:04 -03:00
cd6b62dd76
Ashwalkers to station for no raisen
...
Simply makes it that the ghost role flavor text spawn tells them that it's simply not okay to just run up onto station as an ashwalker. Fight on home turf!
2020-11-16 18:37:48 -08:00
cd6483bda5
Random runtime + icon fix
2020-11-09 17:21:43 -03:00
38cce4ea40
a
2020-11-04 22:08:52 -03:00
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
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
802208e969
Merge pull request #556 from ArchieBeepBoop/roddupe
...
Ladders are now Better Ladders(tm)
2020-10-24 23:17:44 -06:00
fd44d1a9fd
Fix PR #584 and some additions for lockers and kink vendor
2020-10-23 23:19:34 -03:00
9b7eee0a89
merge conflict
2020-10-18 16:54:22 -03:00
cc26593463
Merge pull request #9047 from Poojawa/syntheticbloods
...
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
fa20d21b96
SHITCODE: BECOME MODULAR
2020-10-16 18:41:40 -03:00
b513d3ba77
i am dumb
2020-10-07 23:56:44 -03:00
4bae4c2dbd
TYPO
2020-10-07 20:07:23 -03:00
c6e3bf8f60
Exile Patch + New Time Function
2020-10-07 17:38:25 -03:00
f4e6771f4d
less prob, smaller sound
2020-10-07 12:34:08 -03:00
Archie