Hatterhat
f8c1c829d7
maulers slam people very violently
2020-09-06 15:34:53 -05:00
silicons
815ddd1866
oh boy
2020-08-05 21:34:26 -07:00
silicons
ffd44b78ba
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:26:03 -07:00
silicons
4d48abf3a6
fixes
2020-07-21 11:46:17 -07:00
silicons
416b989e12
changes
2020-07-20 11:35:10 -07:00
silicons
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
silicons
58e26c540c
merge from master
2020-07-20 10:18:44 -07:00
Timothy Teakettle
a8d2f558bc
use old table pushing
2020-07-19 17:53:25 +01:00
Timothy Teakettle
ca6b289da6
fix tables and some minor thing
2020-07-19 17:49:22 +01:00
silicons
55f8e37544
sigh
2020-07-18 20:26:11 -07:00
Timothy Teakettle
1a5008fee7
Merge branch 'master' into wound-port
2020-07-18 23:06:49 +01:00
timothyteakettle
e8fade4f7f
changes
2020-07-18 02:29:12 +01:00
Timothy Teakettle
a4478b0cda
it continues
2020-07-17 22:38:28 +01:00
silicons
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
Ghommie
0779dd560e
More and more fixes.
2020-06-29 18:52:37 +02:00
Timothy Teakettle
b83c428744
Update tables_racks.dm
2020-06-24 14:37:08 +01:00
Ghom
ab5d65a454
Porting the BEPIS research machinery. ( #12277 )
...
* Initial B.E.P.I.S port.
* All nodes but sticky tape are in. Sweet.
* Mapping the BEPIS :DDD
* ah
* deers.
2020-05-24 13:05:15 -07:00
Ghom
d8d59e5052
Fixing old and new issues alike. ( #12281 )
2020-05-17 16:47:53 -07:00
Ghommie
b383066e57
Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS.
2020-05-02 00:00:49 +02:00
Ghommie
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
kevinz000
16d6ba9e21
Merge pull request #11323 from Ghommie/Ghommie-cit600
...
Porting a couple material datums code updates and fixes.
2020-03-06 00:17:21 -07:00
Ghommie
f2c8a7cd6f
Porting a couple material datums code updates and fixes.
2020-03-04 15:59:46 +01:00
kevinz000
b6431b0ef6
changes
2020-03-03 20:54:53 -07:00
kevinz000
8b0b685fa7
CHECK_MOBILITY
2020-03-03 20:40:33 -07:00
kevinz000
f6542b381c
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 23:29:25 -07:00
Ghommie
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
kevinz000
7bcb37c5d1
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-16 21:12:56 -07:00
kevinz000
b341818f04
mobility flags
2020-01-12 11:00:12 -08:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
kevinz000
b6e14c6b86
compile
2020-01-10 14:30:20 -08:00
kevinz000
2c245a18fd
compile
2020-01-10 13:43:53 -08:00
kevinz000
52a0f5779d
Update tables_racks.dm
2020-01-09 15:20:57 -08:00
kevinz000
7378d91684
([\W\.])Knockdown\(
2020-01-06 03:39:20 -08:00
Ghommie
8c5e506a17
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit382
2019-12-21 18:22:58 +01:00
Ghommie
f2aba997c7
consistency
2019-11-20 06:17:43 +01:00
Ghommie
fe171ac40a
Unmodularize several machinery and structures.
2019-11-20 06:13:57 +01:00
Ghommie
21f15e411d
Part 3
2019-11-19 19:34:42 +01:00
Ghommie
a52e292cc8
Ports "examine-code refactor"... part 1...
2019-11-19 03:28:06 +01:00
Poojawa
6d9aa8de70
More carpet options and ways to get them
2019-10-03 22:54:10 -05:00
Ghommie
81fc0c1b32
more foolproofing.
2019-10-02 00:37:02 +02:00
Ghommie
e635a05d16
errors.
2019-10-01 23:43:38 +02:00
Ghommie
d2300765b2
adjacency checks.
2019-10-01 23:16:47 +02:00
Ghommie
cfcd325778
reworking the shoving people action.
2019-10-01 23:13:08 +02:00
kevinz000
0febc1977a
Merge pull request #9191 from Linzolle/fireman
...
Ports fireman carrying from /tg/
2019-09-28 00:38:08 -07:00
Dap
f104ba1f90
Plasmaglass Spears and plasmaglass actually drops plasma shards!
2019-08-25 21:38:04 -06:00
Rob Bailey
5e94a5db80
ports #44155 from /tg/station
2019-08-24 20:21:44 -05: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
Redtail
629189fdc1
Added Another new carpet, and two tables, and a new cargo crate.
...
Added: monochrome. Two new table sprites for the other new carpet. New cargo supply crate for the two new carpets. Changed: the name of the new carpet to "blackred" so it would avoid confusion with the original carpet.
2018-12-07 22:48:46 -06:00
Poojawa
8b9ef1e400
Game folder
2018-09-11 04:06:45 -05:00
deathride58
ac6fddcfb3
Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync
2018-07-05 00:17:44 -04:00
