QuoteFox
fb21e779b1
Nail paint cosmetics
2021-04-17 22:41:02 +01:00
Chloe Carver-Brown
5e5b43212e
fuck shit piss
2021-04-08 01:36:09 +01:00
QuoteFox
99f861a512
new plating and shelves
2021-03-28 16:48:02 +01:00
QuoteFox
a4826e6eab
Revert "Merge remote-tracking branch 'upstream/master'"
...
This reverts commit f5cf7f6f5aa32444dae7
2021-03-27 10:56:34 +00:00
QuoteFox
a1644811ac
Ported Map; Lambda Station
2021-03-25 12:06:32 +00:00
QuoteFox
fa3e559b78
Merge pull request #1046 from lyricalpaws/master
...
Adds psychologist role, changes Box med a bit
2021-03-23 18:13:40 +00:00
Chloe Carver-Brown
0620b5c682
psych job!
2021-03-23 17:21:44 +00:00
QuoteFox
38b5e5b0eb
locker and jumpsuit equip sounds.
2021-03-23 16:27:18 +00:00
QuoteFox
9dd61f3efb
Pens now write on people, Harm intent to stab them like the old way.
...
Washable at showers.
2021-02-22 23:08:42 +00:00
Kharkov72
4e2d9a3bd0
I cannot let this go unadded
2021-02-21 00:53:05 -05:00
DragonTrance
75415bb7af
you know what, dont even deconstruct them
2021-02-10 07:33:11 -07:00
DragonTrance
d09400af15
stop exploiting constructable showers
2021-02-10 07:23:31 -07:00
QuoteFox
4980b0556d
Merge pull request #936 from ArchieBeepBoop/solar
...
Modular Solar Panels + Solar Tracker Fix + Compile issue fix
2021-01-29 20:38:48 +00:00
Archie
d50b781203
SolarTest11
2021-01-28 20:22:08 -03:00
Kabra_men
0b1a40baee
that's a lot of stuff heck
2021-01-28 18:28:48 -03:00
Kabra_men
41c87b5e85
more wood stuff
2021-01-25 17:37:06 -03:00
QuoteFox
3566f1c9a6
fixed chair padding on shuttle chairs.
...
fixed chair padding on shuttle chairs.
2021-01-23 10:55:32 +00:00
Kabra_men
3e6fb7b5e8
TREES
2021-01-22 20:45:16 -03:00
Kabra_men
cd9fb045e1
GRASS
2021-01-21 12:02:42 -03:00
Kabra_men
6c0a7b1b39
WOOD
2021-01-21 03:09:52 -03:00
Archie
ec28d0f66d
Line ending conflict fix
2021-01-21 02:45:10 -03:00
nik707
858f994b5d
Adds: The Chad Plasmaglass Table
2021-01-21 02:44:06 -03:00
QuoteFox
75eb4d5696
New chairs and recipes!
...
New chairs and recipes!
2021-01-21 01:20:12 +00:00
CygnusB
8ece699ed9
Merge branch 'master' into punishesarchie
2021-01-19 06:30:10 -03:00
CygnusB
f21db73775
fuck yeah
...
banana
2021-01-19 03:31:33 -03:00
QuoteFox
f806ffd48b
Merge pull request #891 from ArchieBeepBoop/cargo5
...
Small cargo crate revamp + QoL changes
2021-01-17 08:46:25 +00:00
kevinz000
7264218dca
Alien Furniture
2021-01-16 22:57:45 -03:00
Archie
3fa4bf8007
Allows borgs and drones to interact with tank dispensers
2021-01-16 18:38:45 -03:00
Archie
12fde70d0c
Cargo Changes Initial
2021-01-16 17:40:43 -03:00
CapnMachaddish
157c3722ac
no longer shitcode
2021-01-12 00:59:24 -06:00
Archie
80d37a88ae
Fixes ghost role text all around
2021-01-10 12:13:31 -03:00
Archie
c164b52b30
Merge remote-tracking branch 'upstream/master' into nexties2
2021-01-08 15:20:47 -03:00
Archie
78da9a5a12
Merge branch, update to current
2021-01-08 07:26:35 -03:00
kevinz000
939d8258de
Merge pull request #10813 from Ghommie/Ghommie-cit540
...
Unicode support updates from tgstation.
2021-01-08 07:11:56 -03:00
kevinz000
625b35b8cb
Merge pull request #9755 from Ghommie/Ghommie-cit331
...
lentext to length, yet another 513 requirement.
2021-01-05 17:39:10 -03:00
kevinz000
5d80346f8f
Merge pull request #9993 from Ghommie/Ghommie-cit412
...
Ports tgstation loom changes, and durathred golems.
2021-01-05 16:54:23 -03:00
Putnam3145
0db5aed986
Merge pull request #10056 from Ghommie/Ghommie-cit430
...
Ports "Slightly improves visible and audible messages."
2021-01-05 16:51:22 -03:00
Archie
9e37d3be62
Fix merge conflicts
2021-01-05 03:41:08 -03:00
Lin
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
Ghom
291dcf9515
Merge pull request #10575 from Arturlang/TGUIs_Nexties
...
[TESTMERGE] Properly working TGUI Next
2021-01-04 19:47:54 -03:00
QuoteFox
bf1e84193a
Merge pull request #807 from DragonTrance/deconstructing
...
loom slapping fix
2021-01-03 05:42:17 +00:00
DragonTrance
e83cf212c1
loom slapping fix
2021-01-02 13:11:04 -07:00
QuoteFox
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
QuoteFox
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
QuoteFox
333f410476
New Arousal Hud
...
New Arousal Hud, much more user accessable with contextal options.
2021-01-02 13:39:17 +00:00
DragonTrance
f27bafe721
barsign meow mix fix
2021-01-01 12:30:40 -07:00
Chloe Carver-Brown
c2a937bb73
Changing Nanotrasen to Kinaris where needed
2020-12-31 17:58:25 +00:00
DragonTrance
9068e9c580
Update loom.dm
2020-12-25 14:14:52 -07:00
DragonTrance
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
QuoteFox
e6a7a295d2
Wash cum bug again
...
Muliple stacks break it..
2020-12-24 19:39:41 +00:00
