a80dfada21
[WIP] Plasmaglass Tables!
...
## About The Pull Request
Hey hey people, now you can have pink tables. The scientists on SS13 have really out done themselves today. So far it drops regular glass shards, but tg already has plasma glass shards that I'll try to port once I get around to it.
## Why It's Good For The Game
New thing for people to make, basically a stronger table, but it still breaks when a player stands on it.
## Changelog
🆑
add: Plasmaglass tables
/🆑
2019-08-23 12:38:07 -06:00
a971390cff
Merge pull request #8992 from jakeramsay007/Helmet-Internals
...
[READY] Hardsuit helmets can now be used as internals masks. Rejoice, CE mains.
2019-08-11 10:15:49 -07:00
123b478edd
Merge pull request #8927 from Ghommie/Ghommie-cit151
...
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
2019-08-11 10:12:20 -07:00
5dcd419d8a
Merge pull request #8356 from Thalpy/master
...
[READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.
2019-08-11 16:09:23 +12:00
74008beb8f
Merge pull request #9066 from Ghommie/Ghommie-cit181
...
Two lines fixes for invisible zipties and borked legcuffs.
2019-08-09 22:17:31 -07:00
14033d9876
Merge pull request #9085 from Ghommie/Ghommie-cit186
...
underwear colors fix 2: The revenge of the crunch.
2019-08-09 22:15:55 -07:00
02b5100be7
Made scans advanced.
2019-08-09 13:01:14 +01:00
6e0303fdba
Actual fix for #9091
2019-08-09 12:48:26 +01:00
34cfd2c1e3
Fix for #9091
2019-08-09 12:12:25 +01:00
ee57720ee3
underwear colors fix 2: The revenge of the crunch.
2019-08-09 05:11:12 +02:00
12c4fc139d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151
2019-08-09 04:00:23 +02:00
ad7189a211
Merge pull request #9061 from deathride58/fuckfemurbreakers
...
Makes the femur breaker use the proper scream emote and makes the femur breaker guarantee the victim falls into crit
2019-08-08 01:59:51 -07:00
7391581a26
2 small fixes.
2019-08-07 11:33:53 +01:00
2a049e3485
Should fix the locker conflict! (untested)
2019-08-07 09:40:13 +01:00
2256bbb63c
Merge branch 'master' into master
2019-08-07 09:30:53 +01:00
de8137d6c8
One line fix for invisible zipties.
2019-08-06 23:19:28 +02:00
ee1b04eefb
Fixes potential "trapped as ghost" problems and examine+scanner text
2019-08-06 19:54:07 +01:00
ddb29551fc
paren
2019-08-06 11:28:01 -04:00
ee0d7a4ed3
Fixes issues with femur breaker by replacing the forced speech with a proper scream emote and making it guarantee landing in crit
2019-08-06 07:43:28 -04:00
decbd37ced
Update closets.dm
2019-08-06 03:49:08 -04:00
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
aea2f6f523
Merge pull request #8900 from Seris02/spaceruinsyee
...
Abductor Replication Lab space ruin - take 2
2019-08-05 00:55:40 -07:00
9ec56077b6
Merge pull request #8908 from Ghommie/Ghommie-cit142
...
Fixes Zelus flasks a bit.
2019-08-05 00:54:43 -07:00
b292bc7187
Merge pull request #9007 from Ghommie/Ghommie-cit168
...
Fixes and standarizes sword sheaths/scabbards overlays.
2019-08-05 00:49:49 -07:00
86a2d917e5
Merge pull request #8913 from Trilbyspaceclone/clockstoles
...
Makes brass/bronze bar stools and stools - Same as normal ones
2019-08-05 00:45:56 -07:00
9852084200
Merge pull request #9019 from Ghommie/Ghommie-cit172
...
Adds in a stereotypical vegetarian MRE. Tweaks the rest.
2019-08-05 00:44:15 -07:00
f1c9a07f6d
Merge pull request #8912 from Ghommie/Ghommie-cit146
...
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
2019-08-04 22:41:49 -07:00
c92e8b43bf
Merge pull request #9042 from EgoSumStultus/femur-breaker
...
[ THE FEMUR BREAKER ]
2019-08-04 22:27:42 -07:00
5bfe4492a1
huhhh... huhu....
2019-08-04 22:15:10 -07:00
489b4c78dc
Merge pull request #8996 from Ghommie/Ghommie-cit166
...
Adds in worn overlays for different types of cuffs.
2019-08-04 19:19:19 -07:00
7a3d895997
Merge pull request #9040 from Trilbyspaceclone/cooking_101_Cakes
...
Tweaks cakes, adds in more of them as well as a few more tarts - All hidden
2019-08-04 19:15:18 -07:00
8452cf3b8a
Merge pull request #9014 from Ghommie/Ghommie-cit170
...
undergarment fixes.
2019-08-04 19:13:21 -07:00
4dcdf7ac4d
Merge pull request #9044 from Sishen1542/rock-lock
...
Adds the ability to construct and deconstruct locker locks
2019-08-04 19:07:35 -07:00
27b3cb6656
Merge pull request #9018 from Ghommie/Ghommie-cit171
...
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-08-04 19:04:59 -07:00
f9d829b111
Proc to define
2019-08-04 05:48:08 +01:00
46e4023ba9
Monkey business
2019-08-04 05:07:24 +01:00
1f100f1f3b
crush my lock with a rock i must
2019-08-03 18:48:14 -04:00
464a589c25
*sobbing noises*
2019-08-03 07:34:32 -07:00
b3b8d71cc7
huuhuh... HUUuhuhuhh....
2019-08-02 22:41:01 -07:00
b208a475ef
huuhhuuhuhh....
2019-08-02 21:37:56 -07:00
3a85f9473c
amazing
2019-08-02 14:37:52 -04:00
50ea3970f6
huhuhuhuguhuuhh...
2019-08-02 09:25:38 -07:00
45655c65f3
HUHUUGGUUHUHHUHUHHhhh...
2019-08-02 08:32:49 -07:00
7f3e5ad3d0
AAUUGUGGHHHGHUGHUGHHH!!
2019-08-02 08:07:00 -07:00
6b72e04708
HUFF HUFF HUFf...
2019-08-02 07:38:40 -07:00
5814ab7e8f
BRRREEEEEEEEEEEEEEEEEEEEE
2019-08-02 06:23:02 -07:00
a82f9c011b
Merge pull request #9004 from Trilbyspaceclone/Crafting
...
Ports "Adds helpers for finding martial arts types #42045 " as well as "Adds simple framework for learnable crafting recipes #43296 "
2019-08-02 00:57:05 -07:00
dba6a25b15
Merge pull request #9011 from Trilbyspaceclone/patch-201
...
Ports "Gauze can now be applied to corpses #44199 "
2019-08-02 00:54:57 -07:00
18b03f9053
Furranium fixes.
2019-08-01 03:38:06 +01:00
6dd92ce122
.
2019-07-31 21:26:59 +02:00
Dap