cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,809 Commits 55 Branches 0 Tags
d7718c8dd1d883757a9cc3201ad9cf56fcfeda81
Commit Graph

17797 Commits

Author SHA1 Message Date
r4d6
d7718c8dd1 Revert "Conflict Fix part 1" 
This reverts commit 2ab07fdb82.
 2020-01-06 23:43:27 -05:00
r4d6
2ab07fdb82 Conflict Fix part 1 2020-01-06 23:43:04 -05:00
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
r4d6
5e3abec704 Removing turf with RCD cost mats. 
Port : https://github.com/tgstation/tgstation/pull/46801
 2020-01-03 02:06:47 -05:00
nik707
0f9c3350cd Merge pull request #10189 from Putnam3145/storytellers 
n word
 2020-01-02 22:01:19 -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
Lin
4b7e6ec2a5 Merge pull request #10270 from Ghommie/Ghommie-cit489 
randomized recipes fallback fix.
 2020-01-02 23:56:43 +00: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
kevinz000
67d9923ff7 Merge pull request #10371 from kappa-sama/patch-15 
call of duty loot boxes
 2020-01-01 22:08:20 -08: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
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
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
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
nik707
e232b13119 Merge pull request #10369 from Hatterhat/patch-4 
crusher trophy drop chance increase
 2020-01-01 20:28:35 -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
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
Putnam
d0b1c442a0 tweaks 2020-01-01 13:15:13 -08:00
Putnam
607109e0d2 also added individual ballot gathering 2020-01-01 12:29:13 -08:00
Putnam
444f862a4d Renamed the options to make clear this isn't scoring? 2020-01-01 11:37:40 -08:00
Hatterhat
200de62b8e tweaks transfer amounts, uncucks hypovials 2020-01-01 08:50:15 -06:00
kevinz000
68bc6dcc2a Update megafauna.dm 2020-01-01 02:43:43 -08:00
Putnam
96cbc2704f Made random always available. 2020-01-01 00:32:49 -08:00
Putnam
bf752ab2e6 more extreme. 2020-01-01 00:30:34 -08:00
Putnam
d6fece9a57 removed extended weighting on intrigue 2020-01-01 00:28:39 -08:00
Putnam
6bbdd5d576 try recent round removal again 2020-01-01 00:26:55 -08:00
Hatterhat
0374870c41 bulldogs knockback too 2020-01-01 02:04:03 -06:00
Putnam
42347fd5ea more conveyance on how the voting works 2019-12-31 23:19:39 -08:00
Putnam
9b0e27cbc3 2 minute vote time 2019-12-31 23:11:34 -08:00