Commit Graph

27807 Commits

Author SHA1 Message Date
r4d6
4e528da5c2 Correct price and rpd 2020-01-04 19:06:56 -05:00
r4d6
62ea644dd0 ugh, make rcds that are able to remove r-wall be able to remvoe r-doors too.
THERE I DID GRAY YOU CAN NOW SHUT UP!!
2020-01-03 16:26:53 -05:00
r4d6
221cb980d6 forgot a / 2020-01-03 03:25:53 -05:00
r4d6
880db10033 Forgot some more mats 2020-01-03 03:22:18 -05:00
r4d6
aedf634355 Fix mats. 2020-01-03 03:15:30 -05:00
r4d6
94cd2ea108 Merge branch 'RCD-Updates' of https://github.com/r4d6/Citadel-Station-13 into RCD-Updates 2020-01-03 03:13:21 -05:00
r4d6
3f5d4ad835 remove a duplicate comment 2020-01-03 03:13:03 -05:00
r4d6
7347cb0ba6 Merge branch 'master' into RCD-Updates 2020-01-03 03:09:11 -05:00
r4d6
58a986696f Add RCD and RPD to Engie's protolathe
Half-port with bonus : https://github.com/tgstation/tgstation/pull/47289
2020-01-03 02:46:25 -05:00
r4d6
5c94e02eac Add simple RCD Circuits
Port : https://github.com/tgstation/tgstation/pull/45357
2020-01-03 02:32:43 -05:00
r4d6
15d79d8818 RCD don't work on R-Doors
Port : https://github.com/tgstation/tgstation/pull/43598
2020-01-03 02:14:41 -05:00
r4d6
37d50e2aaf Add RCD effects
Port : https://github.com/tgstation/tgstation/pull/47894 & https://github.com/tgstation/tgstation/pull/48362/files
2020-01-03 02:13:20 -05:00
CitadelStationBot
82db38d5d6 Automatic changelog generation for PR #10255 [ci skip] 2020-01-03 01:07:23 -06:00
kevinz000
c0d3b08ab0 Merge pull request #10255 from Xantholne/xantholne-christmas02
Hopefully fixes the broken Christmas clothes that no one knows how they broke?
2020-01-02 23:07:20 -08:00
r4d6
5e3abec704 Removing turf with RCD cost mats.
Port : https://github.com/tgstation/tgstation/pull/46801
2020-01-03 02:06:47 -05:00
CitadelStationBot
f4b35e635b Automatic changelog generation for PR #10189 [ci skip] 2020-01-02 22:01:22 -06:00
nik707
0f9c3350cd Merge pull request #10189 from Putnam3145/storytellers
n word
2020-01-02 22:01:19 -06:00
CitadelStationBot
312d569039 Automatic changelog generation for PR #10238 [ci skip] 2020-01-02 18:01:56 -06:00
Lin
f7b91f9b65 Merge pull request #10238 from Ghommie/Ghommie-cit478
Brings in some mapping code updates.
2020-01-03 00:01:54 +00:00
Lin
b1ccd512db Merge pull request #10215 from Ghommie/Ghommie-cit473
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
2020-01-03 00:00:51 +00:00
CitadelStationBot
3a20d16b2e Automatic changelog generation for PR #10270 [ci skip] 2020-01-02 17:56:46 -06:00
Lin
4b7e6ec2a5 Merge pull request #10270 from Ghommie/Ghommie-cit489
randomized recipes fallback fix.
2020-01-02 23:56:43 +00:00
CitadelStationBot
2f1e44a3a5 Automatic changelog generation for PR #10388 [ci skip] 2020-01-02 17:54:17 -06:00
Lin
5d667a3540 Merge pull request #10388 from CameronWoof/ez-valids
Adds the "View Crew Manifest" verb to Robots
2020-01-02 23:54:14 +00:00
kevinz000
b580d1dc32 Merge pull request #10390 from deathride58/orangespleasestopforcepushing
[s] removes fun
2020-01-02 08:56:49 -08:00
Putnam
12680566b7 fixed voting.
FUCK
2020-01-01 23:37:14 -08:00
CitadelStationBot
ab15fdcabf Automatic changelog generation for PR #10371 [ci skip] 2020-01-02 00:08:23 -06:00
kevinz000
67d9923ff7 Merge pull request #10371 from kappa-sama/patch-15
call of duty loot boxes
2020-01-01 22:08:20 -08:00
CitadelStationBot
49084e8394 Automatic changelog generation for PR #10366 [ci skip] 2020-01-02 00:07:42 -06:00
kevinz000
16172f68aa Merge pull request #10366 from Hatterhat/beaker-buff
beaker buff - alt title fuck hypovials and fuck making them free and better alternatives to beakers
2020-01-01 22:07:40 -08:00
CitadelStationBot
96a57d74db Automatic changelog generation for PR #10374 [ci skip] 2020-01-02 00:07:20 -06:00
kevinz000
e771ea9066 Merge pull request #10374 from Trilbyspaceclone/patch-260
[s] Fixes Dragon's Tooth Sword 50% armor penetration by making it 35%
2020-01-01 22:07:18 -08:00
Putnam
21fc6d1d2b saving is back 2020-01-01 19:24:13 -08:00
nik707
a881231149 Merge pull request #10395 from Hatterhat/shit-and-cum
space cola isnt a reagent idiot, codeside change only
2020-01-01 20:45:33 -06:00
Hatterhat
1195762f86 space cola isnt a reagent idiot 2020-01-01 20:37:09 -06:00
CitadelStationBot
0ad15d4cb5 Automatic changelog generation for PR #10368 [ci skip] 2020-01-01 20:32:51 -06:00
nik707
1e6a485976 Merge pull request #10368 from Hatterhat/orm-laser-fix-question-mark
ORM lasers actually affect point return
2020-01-01 20:32:48 -06:00
CitadelStationBot
459275fd2e Automatic changelog generation for PR #10379 [ci skip] 2020-01-01 20:32:19 -06:00
nik707
75d5e324ec Merge pull request #10379 from Hatterhat/tg-47443-shotgunpbs
shotgun pointblanking people actually throws them
2020-01-01 20:32:16 -06:00
CitadelStationBot
0f8234b20d Automatic changelog generation for PR #10369 [ci skip] 2020-01-01 20:28:38 -06:00
nik707
e232b13119 Merge pull request #10369 from Hatterhat/patch-4
crusher trophy drop chance increase
2020-01-01 20:28:35 -06:00
CitadelStationBot
6abcb5ad50 Automatic changelog generation for PR #10372 [ci skip] 2020-01-01 20:28:18 -06:00
nik707
be9912227f Merge pull request #10372 from Hatterhat/the-one-with-the-forcefields
forcefield projectors on toolbelts, cool and good sprites for atmos holofan/forcefield proj
2020-01-01 20:28:15 -06:00
deathride58
8390334d1e mirrors tgstation 48524 2020-01-01 18:59:05 -05:00
Putnam
00bc8dbc97 actually no 2020-01-01 15:06:37 -08:00
CameronWoof
9a54467064 Robots can now view the crew manifest 2020-01-01 14:38:46 -08:00
Putnam
b69950ac2b wow good thing this was impossible to check 2020-01-01 13:47:51 -08:00
Putnam
1acb499929 moved a thing to prevent a runtime 2020-01-01 13:26:43 -08:00
CitadelStationBot
58241b704e Automatic changelog generation for PR #10370 [ci skip] 2020-01-01 15:21:42 -06:00
Lin
c836889944 Merge pull request #10370 from Hatterhat/blood-drunk-cripple-bad
blood drunk buff probably shouldnt cripple you
2020-01-01 21:21:39 +00:00