shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,807 Commits 5 Branches 0 Tags
4e528da5c283fa00367b809a3010268fee970dfe
Commit Graph

3601 Commits

Author SHA1 Message Date
r4d6
4e528da5c2 Correct price and rpd 2020-01-04 19:06:56 -05: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
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
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
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
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
Lin
b651bbcdb3 Merge branch 'master' into Ghommie-cit367 2019-12-31 22:37:59 +00:00
Ghom
cba4bc27ef Merge pull request #10349 from KathrinBailey/CE-locker 
CE Locker Vengeance: The Removaling + Welding locker consistency changes + Empty lockers for mappers
 2019-12-31 18:01:23 +01:00
KathrinBailey
243aebe12a dab 2x 2019-12-31 16:54:59 +00:00
KathrinBailey
0a19f62fa9 dab 2019-12-31 16:45:06 +00:00
KathrinBailey
f2e9ba2a8e Makes lockers into subtypes 
Adds new lockers cleanly at the bottom instead and as subtypes.
 2019-12-31 16:41:23 +00:00
Ghom
0453363d4c Merge pull request #10345 from Trilbyspaceclone/patch-256 
Buffs bandoliers to hold more types of casings.
 2019-12-31 14:36:53 +01:00
Ghom
78e4c608ad Merge pull request #10319 from Seris02/coconutsyep 
porting azarak's coconuts from hyper station
 2019-12-31 13:16:07 +01:00
Trilbyspaceclone
c81d0e8b66 Update energy.dm 2019-12-31 05:25:12 -05:00
Hatterhat
5a497b02ac hey i'm WALKIN here 2019-12-31 01:56:01 -06:00
kevinz000
79c609aa40 Update telescopic_iv.dm 2019-12-30 17:55:59 -08:00
nik707
5c13fa64e3 Merge pull request #10338 from Seris02/marshmallow 
marshmallow
 2019-12-30 18:31:06 -06:00
nik707
8a4e44758f Merge pull request #10165 from Ghommie/Ghommie-cit456 
Minor underwear fixes and tweaks.
 2019-12-30 18:28:48 -06:00
nik707
23f79ffed8 Merge pull request #10123 from Citadel-Station-13/throwing_disarm_stuff 
throwing now only randomly turns things if you are on harm intent
 2019-12-30 18:28:16 -06:00
CameronWoof
d8c9dd967b Dolly Dress-Up: Ghost Hunter Edition 2019-12-30 14:31:47 -08:00
Ghom
e309497af2 Merge pull request #10339 from Seris02/teleivdrip 
telescopic IV drips
 2019-12-30 18:24:50 +01:00
Seris02
f0ba93052d yee2. 2019-12-30 23:53:10 +08:00
KathrinBailey
283ccceb24 CE Locker Exodus: The Removaling 
Removes junk from the CE locker.
Adds empty engineering lockers.
I don't know how to do this as a child and not have populate contents fill the child.
 2019-12-30 09:25:03 +00:00
kevinz000
47c92e380c Merge branch 'master' into throwing_disarm_stuff 2019-12-30 00:05:17 -08:00
Seris02
40730b48d5 few fixes 2019-12-30 11:49:16 +08:00
Seris02
f1292c503c makes it a trait 2019-12-30 11:33:15 +08:00
Seris02
f663c4db96 tiny fixes 2019-12-30 11:24:12 +08:00
Trilbyspaceclone
4a5715e5ac Update belt.dm 2019-12-29 19:13:32 -05:00
Ghommie
edd05cebea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-30 00:28:36 +01:00
Seris02
b96bcf6eec tiny fix 2019-12-29 23:47:30 +08:00
Seris02
a39c0249c4 marshmallow 2019-12-29 21:55:25 +08:00
Seris02
1ff7709765 all of the weh. 2019-12-29 00:12:25 +08:00
Seris02
7bde63dcc4 weh 2019-12-28 23:58:28 +08:00
Seris02
cd9966cd7a fixes the thing 2019-12-28 17:08:34 +08:00
Seris02
69d82338bc excludes certain ghost roles from being affected by health events 2019-12-28 16:46:50 +08:00
Seris02
4a2b7c2438 cocooooonuuuuuuts 2019-12-28 16:02:53 +08:00
Lin
d562a5ba27 Merge pull request #10212 from Ghommie/Ghommie-cit471 
Ports some hud and update_icon code updates.
 2019-12-28 04:07:03 +00:00
Lin
80daaacc86 Merge pull request #10268 from Ghommie/Ghommie-cit487 
Effectively removes the old unused roboticist encryption key and headset.
 2019-12-28 00:08:24 +00:00
Lin
be57c26acc Merge pull request #10289 from Ghommie/Ghommie-cit493 
[s] fixes a little door assembly glass dupe exploit
 2019-12-28 00:06:25 +00:00
Ghom
13fc20c7c3 Merge pull request #10296 from Useroth/ghostcafe 
Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility.
 2019-12-27 16:30:13 +01:00
Useroth
a3776fb966 Small touch-up. 2019-12-27 16:05:07 +01:00
Useroth
c3298d525f Good idea, tbh. 2019-12-27 15:57:49 +01:00
Useroth
35846c452a Applied suggestions and minor tweaks. 2019-12-26 20:03:43 +01:00
Ghom
12d0a2ee4c Merge pull request #10281 from Hatterhat/4-am-coding-more-like-4head 
good idea: .357 speedloaders printable with advanced illegal ballistics, bad idea: revolver now gets an extra speedloader and a box
 2019-12-26 16:07:45 +01:00
Ghom
512d046f18 Merge pull request #10128 from Seris02/clownheadset 
gives the clown a headset with a clown megaphone loudmode
 2019-12-26 13:58:45 +01:00
Useroth
cbff758d1a Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility. 2019-12-26 07:49:48 +01:00