994bfddc1b
Merge pull request #9477 from Thalpy/tgOrganFixes
...
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
2019-10-16 12:44:34 -07:00
7b2c8e58ff
Fixes freezing and ghost rider
2019-10-14 13:23:39 +01:00
e969e89ce5
Well, byond quirks.
2019-10-14 03:09:15 +02:00
22fc7a9088
Resprites bedsheet bins in 3/4 perspective, adds towel bins subtype.
2019-10-14 02:32:23 +02:00
b56563fcfe
Merge pull request #9374 from kappa-sama/walktime
...
ashwalkers now have more messages telling them to not go on station
2019-10-11 12:13:49 -07:00
abef83f56e
Merge pull request #9427 from Ghommie/Ghommie-cit219
...
Skeleton and zombie tweaks/balance (featuring "makes halloween skeletons not the overpowered pirate ones")
2019-10-08 00:34:33 -07:00
76ede7a473
Merge pull request #9406 from Poojawa/carpet-colors
...
More Carpet colors and liquid carpet varients
2019-10-07 23:39:52 -07:00
0073d99a22
Merge pull request #9309 from Thalpy/tg-Organ-port
...
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
2019-10-07 23:29:19 -07:00
a1a3bbe99f
Skeleton tweaks (featuring "makes halloween skeletons not the overpowered pirate ones")
2019-10-06 19:16:13 +02:00
9d2d84f53d
Update table_frames.dm
2019-10-04 15:49:25 -05:00
6d9aa8de70
More carpet options and ways to get them
2019-10-03 22:54:10 -05:00
81fc0c1b32
more foolproofing.
2019-10-02 00:37:02 +02:00
e635a05d16
errors.
2019-10-01 23:43:38 +02:00
d2300765b2
adjacency checks.
2019-10-01 23:16:47 +02:00
cfcd325778
reworking the shoving people action.
2019-10-01 23:13:08 +02:00
89f3a01bc0
Merge branch 'master' into tg-Organ-port
2019-10-01 06:17:58 +01:00
c42d5b31a1
ok justin
2019-09-30 20:13:31 -04:00
0febc1977a
Merge pull request #9191 from Linzolle/fireman
...
Ports fireman carrying from /tg/
2019-09-28 00:38:08 -07:00
33c3f0834e
Prevents sofas being wielded and thus transformed into normal chairs.
2019-09-21 20:01:42 +02:00
587568bf88
Merge branch 'master' into tg-Organ-port
2019-09-19 01:33:15 +01:00
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
eab0b8934f
Merge pull request #9279 from Ghommie/Ghommie-cit192
...
Fixing undergarments color preferences resetting each round.
2019-09-13 10:43:43 -07:00
e0a29ec001
Fixing undergarments color resetting each round.
2019-09-12 02:48:26 +02:00
64b757f404
refactor suits
2019-09-07 17:10:10 -05:00
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
19678119c5
Merge branch 'plasmatables' into plasmaglass-tables-spears
2019-08-28 14:55:01 -06:00
f104ba1f90
Plasmaglass Spears and plasmaglass actually drops plasma shards!
2019-08-25 21:38:04 -06:00
5e94a5db80
ports #44155 from /tg/station
2019-08-24 20:21:44 -05:00
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
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
e838da8039
Merge pull request #3 from Citadel-Station-13/master
...
3
2019-08-17 11:55:56 +10:00
3281f23eb6
made changes as per bhijns request
2019-08-14 16:30:54 -04: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
e4a9f2743b
and gitbabby
2019-08-11 11:14:07 +10: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
ee57720ee3
underwear colors fix 2: The revenge of the crunch.
2019-08-09 05:11:12 +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
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
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
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
8452cf3b8a
Merge pull request #9014 from Ghommie/Ghommie-cit170
...
undergarment fixes.
2019-08-04 19:13:21 -07: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
kevinz000