shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,011 Commits 5 Branches 0 Tags
a91f31d9e68eaec6247f0bf7e78190aec7905698
Commit Graph

6339 Commits

Author SHA1 Message Date
r4d6
68e48209da Fix 2020-01-07 02:04:06 -05:00
r4d6
20d5e4f480 Make the RCD show its upgrades on examination. 
And remove a small copy-pasta.
 2020-01-07 01:45:59 -05:00
r4d6
c3f47e713a Merge branch 'master' into RCD-Updates 2020-01-07 00:04:43 -05:00
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
kevinz000
f6b9396096 Merge pull request #10439 from LetterN/tachelon-logs 
doppler logs
 2020-01-06 19:45:28 -08:00
Lin
2ce3b7fbf5 Merge pull request #10455 from Ghommie/Ghommie-cit501 
Porting some runtime fixes.
 2020-01-07 01:00:25 +00:00
Lin
718d4a080d Merge pull request #9878 from Ghommie/Ghommie-cit382 
Unmodularize several machinery and structures
 2020-01-07 00:31:24 +00:00
Ghom
d07d436ba2 Merge pull request #10384 from Hatterhat/tg-43454-43688-the-one-with-the-cargo 
cargo tweaks, new shit, why do digitigrade sprites exist
 2020-01-06 21:47:15 +01:00
Ghommie
dcb2ae77fa Porting some runtime fixes. 2020-01-06 02:14:25 +01:00
Letter N
de14073956 limit 2020-01-06 08:34:48 +08:00
Ghom
e18244671f Merge pull request #10350 from Putnam3145/dojo-ghostrole 
Ghost cafe quality-of-life, plus making ghost role eligibility an element
 2020-01-05 23:05:13 +01:00
Ghom
516ec585d2 Merge pull request #10435 from Hatterhat/tg-40394 
biogenerator can print flour sacks and enzyme now, also some boxes idk
 2020-01-05 16:22:44 +01:00
Ghom
eeb9ec5f35 Merge pull request #10380 from Hatterhat/tg-43000-powerfists 
powerfists throw people faster but also leak their gas into the air
 2020-01-05 15:12:06 +01:00
Letter N
ba7f0dab62 doppler logs! 2020-01-05 19:16:37 +08:00
Hatterhat
f166586ca0 a comma 2020-01-04 21:05:55 -06:00
Hatterhat
5b0d20cf37 this one fucking tab 2020-01-04 19:52:01 -06:00
Hatterhat
46ced736ba what the fuck was that damage my guy 2020-01-04 19:51:06 -06:00
r4d6
4e528da5c2 Correct price and rpd 2020-01-04 19:06:56 -05:00
Ghom
07a5f052d3 Merge pull request #10400 from chefferz/chefferz-toiletshuttle 
Gives ability to buckle yourself to a toilet
 2020-01-04 14:25:54 +01:00
Ghom
3086b5eb38 boolean 2020-01-04 14:19:15 +01:00
Hatterhat
92f6fe129a tgstation 40394 port 2020-01-04 07:14:39 -06:00
Ghom
499907f9b7 Merge pull request #10191 from Citadel-Station-13/michael_labs 
Custom Holoforms for pAIs and AIs oh and adds certain cyborg pai holograms. also mild pai nerf.
 2020-01-04 14:07:25 +01:00
Ghom
39da7cc58e Merge pull request #10419 from Citadel-Station-13/kevinz000-patch-6 
HELP I CANT POWERGAME NANITES IF I CANT MAKE NANITE MACHINES (please testmerge these things more)
 2020-01-04 14:03:01 +01:00
Hatterhat
5142a0e4ae that should probably be there 2020-01-04 02:07:19 -06:00
Hatterhat
7c98656939 upstream merge 2020-01-04 01:48:50 -06:00
Hatterhat
186194418e tg 43454+43688 port, tweaks w/ trilby, db crate 2020-01-04 01:33:32 -06:00
Linzolle
d0263fc669 don't act on non mobs 2020-01-03 18:21:08 -06: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
kevinz000
d1d9b7a179 Merge pull request #10403 from r4d6/patch-1 
Add a way to make opaque plastic flaps
 2020-01-03 08:16:17 -08:00
kevinz000
04649efc62 Update stack.dm 2020-01-03 02:46:57 -08:00
r4d6
7347cb0ba6 Merge branch 'master' into RCD-Updates 2020-01-03 03:09:11 -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
Putnam
adf87c7595 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2020-01-02 22:52:24 -08: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
r4d6
6e5d04ff1f Adding a way to make opaque plastic flaps 2020-01-02 02:52:48 -05:00
chefferz
46feaf9663 Update watercloset.dm 2020-01-02 01:09:29 -05: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
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
Putnam
96cbc2704f Made random always available. 2020-01-01 00:32:49 -08:00
Putnam
d6fece9a57 removed extended weighting on intrigue 2020-01-01 00:28:39 -08:00
kevinz000
094d225874 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-31 19:54:01 -08:00
Hatterhat
ef36b9df75 i love democracy 2019-12-31 21:44:03 -06:00
kevinz000
1051d99fdf Merge pull request #10361 from CameronWoof/fashion-ghosts 
Ghost Cafe patrons now spawn with chameleon kits
 2019-12-31 19:28:55 -08:00
CameronWoof
58e50de434 grampa ghommles doesn't like kids and their newfangled technology and also the VA denied his claim and now he hates bureaucracy 2019-12-31 17:44:18 -08:00