shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,521 Commits 5 Branches 0 Tags
10c95fa111c5cd87ea5eba4f91dcee013a6b22d8
Commit Graph
2845 Commits
Author SHA1 Message Date
GhomandGitHub 6f66d76680 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1 
Cleanup/Partial revert of RGB blood ""rework""
 2020-02-02 19:08:57 +01:00
GhomandGitHub 97be223b0b Merge pull request #10799 from Seris02/goldentoolboxfix 
makes the golden ""plastitanium"" toolbox actually plastitanium
 2020-02-02 19:08:16 +01:00
GhomandGitHub 8a81ba9efe Ok here we go. 2020-02-02 18:40:06 +01:00
GhomandGitHub ee533da3d7 Putting GLOB.blood_reagent_types at use. 2020-02-02 18:34:14 +01:00
Artur e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
kevinz000andGitHub 66a2216ef3 Merge pull request #10829 from Ghommie/Ghommie-cit544 
Fixed and brutalized clown op slippery weapons a little.
 2020-02-02 03:16:23 -07:00
kevinz000andGitHub c94b5688db Merge pull request #10810 from YakumoChen/ring 
Adds ring jewelry
 2020-02-02 03:16:01 -07:00
kevinz000andGitHub 33577e0d82 Merge pull request #10813 from Ghommie/Ghommie-cit540 
Unicode support updates from tgstation.
 2020-02-02 01:47:24 -07:00
kevinz000andGitHub 88c20b1ea5 Merge pull request #10834 from Trilbyspaceclone/patch-273 
Craftable Crates!
 2020-02-02 01:43:32 -07:00
kevinz000andGitHub 3fc832fbe7 Merge pull request #10819 from Ghommie/Ghommie-cit541 
clown ops infiltrator consistency.
 2020-02-02 01:39:08 -07:00
kevinz000andGitHub 664c4cdea9 Merge pull request #10831 from Citadel-Station-13/Ghommie-patch-1 
Fixing chaplain armaments beacon edge case.
 2020-02-02 01:38:34 -07:00
kevinz000andGitHub e97af26236 ok ghom 2020-02-02 01:37:11 -07:00
GhomandGitHub 3337181cac Merge pull request #10352 from Seris02/smchanges 
Changes to the way SM handles power related to integrity and max integrity damage
 2020-02-01 18:46:10 +01:00
Putnam3145andGitHub 33122d0d92 Merge branch 'master' into TGUIs_Nexties 2020-02-01 00:49:10 -08:00
TrilbyspacecloneandGitHub 4625d4f25d Update sheet_types.dm 2020-02-01 01:56:41 -05:00
TrilbyspacecloneandGitHub fa40490915 Update sheet_types.dm 2020-02-01 01:08:14 -05:00
GhomandGitHub e7589715a8 Fixing chap armaments beacon. 2020-02-01 05:13:29 +01:00
Ghommie 07b6d278a1 fixed and brutalized clown op slippery weapons a little. 2020-02-01 04:48:40 +01:00
ShadeAwareandGitHub c46c683664 FIXES FANCY SWITCHBLADES 
ONCE, AND FOR ALL MAYBE HOPEFULLY FINALLY. FUCK!!!
 2020-01-31 21:12:08 -05:00
GhomandGitHub c9e315a9e6 Merge pull request #10781 from r4d6/RPD 
RPD icon reorder, less building pixelhunting
 2020-02-01 01:48:59 +01:00
GhomandGitHub fddd79b466 Merge pull request #10777 from Citadel-Station-13/kevinz000-patch-4 
Gangs can now only tag with GANG spraycans, rather than lathed spraycans
 2020-02-01 01:44:19 +01:00
GhomandGitHub 327bfcac2f Merge pull request #10786 from Commandersand/frick 
made the centcomm suit syndies order be a variant with no sensors
 2020-02-01 01:42:55 +01:00
Ghommie ab4aa29576 clown ops infiltrator consistency. 2020-02-01 00:02:31 +01:00
Artur 54cd2585cf Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-01-31 23:18:51 +01:00
YakumoChenandGitHub 4c4fda8091 line ending 2020-01-31 14:14:34 +00:00
YakumoChenandGitHub 89134d8b30 updates fancy 
the boxes actually work now
 2020-01-31 08:52:45 -05:00
ArturlangandGitHub d26ca9dbf0 Fixes this 2020-01-31 13:57:30 +01:00
YakumoChenandGitHub 1ed4b90e5f update fancy 2020-01-31 07:14:58 -05:00
YakumoChenandGitHub 065691ca1e adds ring boxes to fancy 2020-01-31 06:33:13 -05:00
Ghommie 188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Seris02 81039b131b fixes 2020-01-31 09:49:08 +08:00
GhomandGitHub 15e5f0ef5d Merge pull request #10644 from ShadeAware/master 
Craftable Switchblades: The Finale
 2020-01-30 21:30:55 +01:00
ArturlangandGitHub 83ce84cdc4 Merge branch 'master' into TGUIs_Nexties 2020-01-30 20:46:20 +02:00
Commandersand 27c915ec75 honk 2020-01-30 02:04:48 -06:00
kevinz000andGitHub e6e545b1f2 Merge pull request #9860 from Ghommie/Ghommie-cit374 
Ports "Mime PDAs only accept emojis for messages, mime cartridge comes with an emoji guidebook"
 2020-01-29 20:15:22 -07:00
GhomandGitHub 1caa2af4cf Update weaponry.dm 2020-01-30 04:05:35 +01:00
GhomandGitHub 793cc26ddc Update weaponry.dm 2020-01-30 03:28:47 +01:00
GhomandGitHub 096d9e01e1 Update weaponry.dm 2020-01-30 03:19:04 +01:00
GhomandGitHub b2ca380a13 Update weaponry.dm 2020-01-30 03:15:24 +01:00
r4d6 58b969b8c6 Update RPD.dm 2020-01-29 20:34:57 -05:00
kevinz000andGitHub 0f4e30c2db Update crayons.dm 2020-01-29 16:13:29 -07:00
GhomandGitHub 7839724013 Merge pull request #10295 from Citadel-Station-13/kevinz000-patch-2 
Brain surgery can now fix an abductee's mindsnap objectives
 2020-01-29 05:34:49 +01:00
GhomandGitHub cf3466252e Merge pull request #10694 from Citadel-Station-13/kevinz000-patch-4 
[s] more reasonable reagent logging
 2020-01-29 01:59:09 +01:00
kevinz000andGitHub 3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527 
Ported further runtime fixes by AnturK.
 2020-01-28 17:57:26 -07: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
ShadeAwareandGitHub 92398ae354 Why am I having such trouble with a fucking SPAN CLASS 2020-01-26 19:46:30 -05:00
ShadeAwareandGitHub 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
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
ShadeAware 2cd6ed5f26 REEEE STRAY SLASHES 
WHY CAN'T I DO THINGS RIGHT THE FIRST TIME
 2020-01-26 16:31:00 -05:00