shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,712 Commits 5 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

19834 Commits

Author SHA1 Message Date
kevinz000
0eb13d8f23 refactors guns a bit 2020-01-27 17:39:49 -07:00
Winter Flare
6e7d079928 Changed Dirty Mags and Candle 2020-01-27 19:34:33 -05:00
kevinz000
e50eb495df pre attack refactor 2020-01-27 16:30:23 -07:00
kevinz000
402abd9287 Merge branch 'god_wish_your_plushies_holy_shit' of github.com-kevinz000:kevinz000/Citadel-Station-13 into god_wish_your_plushies_holy_shit 2020-01-27 15:48:14 -07:00
kevinz000
54f9df9f88 ;GUYS WHERE'S PORT I KEEP FORGETTING MY DIRECTIONS 2020-01-27 13:19:53 -07:00
Ghom
0ed72c7722 Merge pull request #10692 from Citadel-Station-13/TESTING 
faster get_hearers_in_view/getallcontents i guess
 2020-01-27 21:06:52 +01:00
CygnusB
675e6cb9a6 Reunites Shaggy (hair from virgo) with Scooby Terrowin 
self-insert baby pr florida man tries to merge his hair back into citadel
 2020-01-27 15:51:38 -03:00
Ghom
5dc92f3968 Merge pull request #10733 from Hatterhat/fine-i'll-do-it-myself 
the zombie powder nerf - tgstation#46931
 2020-01-27 17:34:58 +01:00
Winter Flare
5bc590ad52 Merge branch 'master' into cargocratetglass 2020-01-27 08:03:30 -05:00
Winter Flare
21fe8be5dc Mmmmm, more crates. 
Fixed: Engineering Hardsuit Crate

Removed:
Duplicate Exotic Seed Crate
Festive Wrapping Paper Crate (Replaced)

Tweak:
Grouped some stuff in each tab. (Medical Kits, Space Suits, Ingredients, Meals)
Added Ambrosia Seed to Seed Crate
Added 2 Spray Cans to Biker Gang Crate

Moved:
Grill to Service
All Vending Supplies to a new tab.

Added:
Candle Crate
Dirty Magazine Crate (Emag)
CBT Interrogation Crate (Contraband)
Cargo Packaging Crate
Pest Control Crate (Contraband)
Candlelit Dinner Crate
Portable Air Pump Crate
Portable Scrubber Crate
Pastry Crate
Burger Combo Crate

Known Issues:
I don't know how to get randomised crates to show up in the proper order.
 2020-01-27 07:00:40 -05:00
kevinz000
68227dcdb1 Update misc.dm 2020-01-27 03:53:50 -07:00
kevinz000
fa2cc0cfdf adds 2020-01-27 03:39:27 -07:00
kevinz000
74fb726b8d Update traitor_bro.dm 2020-01-27 03:27:09 -07:00
kevinz000
1e19ec2c50 bad var 2020-01-27 02:59:27 -07:00
kevinz000
4883b36576 compile 2020-01-27 02:55:32 -07:00
kevinz000
d4d315b447 :^) 2020-01-27 02:51:01 -07:00
kevinz000
d5d0a7d7ba Update capture_the_flag.dm 2020-01-26 22:16:18 -07:00
kevinz000
2c1b63cdb9 Update capture_the_flag.dm 2020-01-26 22:07:49 -07:00
kevinz000
d17472b8f2 Update species.dm 2020-01-26 22:00:19 -07:00
kevinz000
f9ee9bdadf Update capture_the_flag.dm 2020-01-26 21:54:23 -07:00
Ghom
1eb3c09bf8 Merge pull request #10703 from Hatterhat/drake-suit-buff-question-mark 
drake armor goliath resistance
 2020-01-27 05:45:03 +01:00
Ghom
6567f9dd0d Merge pull request #10711 from Citadel-Station-13/kevinz000-patch-8 
buffs door crushing
 2020-01-27 05:38:59 +01:00
Ghom
9ee208dd4f Merge pull request #10722 from Putnam3145/fix-relief 
Relief valve fixes
 2020-01-27 05:37:53 +01:00
Ghom
7b49d4842a Fire alarms. 2020-01-27 05:05:08 +01:00
Putnam
233aeaa456 removed some suggested bad possible contraband 2020-01-26 19:03:09 -08:00
r4d6
ad55c7235d I knew I forgot something 2020-01-26 21:21:26 -05:00
r4d6
09448b86e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Moar-Engines 2020-01-26 20:58:37 -05:00
r4d6
4884165d4f Add TEG, Code & config 2020-01-26 20:58:16 -05:00
necromanceranne
52b1f63941 Literally just kills spinfusors 2020-01-27 12:32:40 +11:00
necromanceranne
5e7b7143de Additional adjustments, added more damage to the mini ebow becaues I forgot to do that originally and made large ebows bulky and heavy weapons 2020-01-27 11:48:56 +11:00
ShadeAware
92398ae354 Why am I having such trouble with a fucking SPAN CLASS 2020-01-26 19:46:30 -05:00
ShadeAware
f7373ae40d WHY DID THE INDENTATION NOT SHOW IT WAS FUCKED UP BEFORE 
WEBEDIT CHANGE WEBEDIT CHANGE REEEEEEEEEEEEEE
 2020-01-26 19:42:21 -05:00
Seris02
e45cc4933c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-27 08:33:38 +08:00
Seris02
0d1e458e9c yuh 2020-01-27 08:32:45 +08:00
ShadeAware
fffea32a59 Lets the user know they improved their switchblade. 
Confusion is bad. Lets make it not confusing.
 2020-01-26 19:26:58 -05:00
Ghommie
b6998a0b56 Fixes det revolver being riiiisky. 2020-01-27 00:44:25 +01:00
necromanceranne
8e489a7726 Hopefully I put in the override correctly 2020-01-27 10:41:27 +11:00
Ghom
27cd7745ed Merge pull request #10714 from Citadel-Station-13/kevinz000-patch-9 
is_ctf_target now checks for innate faction var rather than clothing
 2020-01-27 00:14:32 +01:00
ShadeAware
2cd6ed5f26 REEEE STRAY SLASHES 
WHY CAN'T I DO THINGS RIGHT THE FIRST TIME
 2020-01-26 16:31:00 -05:00
ShadeAware
732dd8a3bb Hmm, today I will forget quotes on my strings. 
Thank you Putnam.
 2020-01-26 16:11:22 -05:00
kevinz000
f59a9d0009 aight bet 2020-01-26 14:05:15 -07:00
kevinz000
b4ee518945 Merge pull request #10725 from Putnam3145/fix-rotation 
made engine rotation properly blacklist 0-weighted ones
 2020-01-26 14:04:31 -07:00
ShadeAware
e75807430b Adds Makeshift Sprites and Fancy Sprites; Fancy Crafting 
Not actually crafting but you get the idea. This won't compile haha.
 2020-01-26 15:53:37 -05:00
r4d6
2c8d12aa37 Make people actually able to speak dwarf 2020-01-26 15:50:13 -05:00
kevinz000
41f9669a83 Update other_reagents.dm 2020-01-26 13:29:55 -07:00
kevinz000
9292ff1972 Update damage_procs.dm 2020-01-26 13:27:54 -07:00
r4d6
31dd1bc69f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Dwarven_Language 2020-01-26 14:23:16 -05:00
r4d6
ac84ad803a Add dwarf language 2020-01-26 14:22:21 -05:00
Ghommie
41ee00b7df Refactoring APTFT altclick/verb options into flags 2020-01-26 18:53:16 +01:00
Ghom
17ea82afd6 Update vr_sleeper.dm 2020-01-26 17:25:24 +01:00