kevinz000
eab0b8934f
Merge pull request #9279 from Ghommie/Ghommie-cit192
...
Fixing undergarments color preferences resetting each round.
2019-09-13 10:43:43 -07:00
Ghommie
e0a29ec001
Fixing undergarments color resetting each round.
2019-09-12 02:48:26 +02:00
Linzolle
64b757f404
refactor suits
2019-09-07 17:10:10 -05:00
kevinz000
09ed526594
Merge pull request #9089 from Sishen1542/rapid-construction-dabvice
...
RCDs can be upgraded to create computer/machine frames, moved deconstruction to the upgrade tier
2019-09-07 11:35:09 -07:00
Dap
19678119c5
Merge branch 'plasmatables' into plasmaglass-tables-spears
2019-08-28 14:55:01 -06:00
Dap
f104ba1f90
Plasmaglass Spears and plasmaglass actually drops plasma shards!
2019-08-25 21:38:04 -06:00
Ghommie
24fe7126c4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-08-24 19:05:51 +02:00
Dap
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
lolman360
e838da8039
Merge pull request #3 from Citadel-Station-13/master
...
3
2019-08-17 11:55:56 +10:00
Sishen
3281f23eb6
made changes as per bhijns request
2019-08-14 16:30:54 -04:00
BlackMajor
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
lolman360
e4a9f2743b
and gitbabby
2019-08-11 11:14:07 +10:00
kevinz000
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
Ghommie
ee57720ee3
underwear colors fix 2: The revenge of the crunch.
2019-08-09 05:11:12 +02:00
kevinz000
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
Fermi
7391581a26
2 small fixes.
2019-08-07 11:33:53 +01:00
Fermi
2a049e3485
Should fix the locker conflict! (untested)
2019-08-07 09:40:13 +01:00
Thalpy
2256bbb63c
Merge branch 'master' into master
2019-08-07 09:30:53 +01:00
deathride58
ddb29551fc
paren
2019-08-06 11:28:01 -04:00
deathride58
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
Sishen
decbd37ced
Update closets.dm
2019-08-06 03:49:08 -04:00
Thalpy
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
kevinz000
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
kevinz000
c92e8b43bf
Merge pull request #9042 from EgoSumStultus/femur-breaker
...
[ THE FEMUR BREAKER ]
2019-08-04 22:27:42 -07:00
EgoSumStultus
5bfe4492a1
huhhh... huhu....
2019-08-04 22:15:10 -07:00
kevinz000
8452cf3b8a
Merge pull request #9014 from Ghommie/Ghommie-cit170
...
undergarment fixes.
2019-08-04 19:13:21 -07:00
Sishen
1f100f1f3b
crush my lock with a rock i must
2019-08-03 18:48:14 -04:00
EgoSumStultus
464a589c25
*sobbing noises*
2019-08-03 07:34:32 -07:00
EgoSumStultus
b3b8d71cc7
huuhuh... HUUuhuhuhh....
2019-08-02 22:41:01 -07:00
EgoSumStultus
b208a475ef
huuhhuuhuhh....
2019-08-02 21:37:56 -07:00
EgoSumStultus
50ea3970f6
huhuhuhuguhuuhh...
2019-08-02 09:25:38 -07:00
EgoSumStultus
45655c65f3
HUHUUGGUUHUHHUHUHHhhh...
2019-08-02 08:32:49 -07:00
EgoSumStultus
7f3e5ad3d0
AAUUGUGGHHHGHUGHUGHHH!!
2019-08-02 08:07:00 -07:00
EgoSumStultus
6b72e04708
HUFF HUFF HUFf...
2019-08-02 07:38:40 -07:00
EgoSumStultus
5814ab7e8f
BRRREEEEEEEEEEEEEEEEEEEEE
2019-08-02 06:23:02 -07:00
Ghommie
397c62bf7a
undergarment fixes.
2019-07-31 16:19:25 +02:00
Fermi
d080446a77
Merge branch 'pr/20'
2019-07-28 23:28:19 +01:00
Sishen
68083aa0c6
a
2019-07-25 21:43:02 -04:00
Sishen
8563af71b3
Update security.dm
2019-07-25 21:43:02 -04:00
Sishen
612021b9d5
h
2019-07-25 21:43:02 -04:00
Thalpy
123c9199ba
Added Eigenlockers. I love them.
2019-07-25 20:51:09 +01:00
Ghommie
589cdae0e1
Towels
2019-07-18 00:03:49 +02:00
TrilbySpaceClone
ba63926905
Sitting on the job
2019-07-16 22:42:57 -04:00
Ghommie
1e1f8e627f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-07-15 17:33:41 +02:00
kevinz000
2ec5d3f02e
Merge pull request #8886 from Ghommie/Ghommie-cit137
...
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-14 14:05:20 -07:00
Ghommie
a3a2fb03b6
My bad, my bad.
2019-07-14 14:21:28 +02:00
kevinz000
b153294a24
Merge pull request #8857 from Ghommie/Ghoomie-cit127
...
Refactoring underwear to allow custom color preferences.
2019-07-14 03:38:45 -07:00
Ghommie
129ca9d71f
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
kevinz000
57891813db
Merge pull request #8847 from Ghommie/Ghommie-cit123
...
Porting in two bar signs.
2019-07-12 07:36:29 -07:00
kevinz000
650842b384
Merge pull request #8854 from Ghommie/Ghommie-cit126
...
Stamina damage melee weaponry fixes.
2019-07-12 07:36:01 -07:00
