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

7015 Commits

Author SHA1 Message Date
YakumoChen
4c4fda8091 line ending 2020-01-31 14:14:34 +00:00
YakumoChen
89134d8b30 updates fancy 
the boxes actually work now
 2020-01-31 08:52:45 -05:00
Arturlang
d26ca9dbf0 Fixes this 2020-01-31 13:57:30 +01:00
YakumoChen
1ed4b90e5f update fancy 2020-01-31 07:14:58 -05:00
YakumoChen
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
Tupinambis
ffa7590203 Status Displays should now actually work 2020-01-30 16:07:26 -06:00
Ghom
15e5f0ef5d Merge pull request #10644 from ShadeAware/master 
Craftable Switchblades: The Finale
 2020-01-30 21:30:55 +01:00
Ghommie
fe9f86d7c2 A 2020-01-30 20:25:37 +01:00
Ghommie
d84798ff32 rogue one. 2020-01-30 19:47:08 +01:00
Arturlang
83ce84cdc4 Merge branch 'master' into TGUIs_Nexties 2020-01-30 20:46:20 +02:00
Ghommie
d2520ee5f4 Topic_input helper removal. 2020-01-30 19:45:01 +01:00
Commandersand
27c915ec75 honk 2020-01-30 02:04:48 -06:00
Seris02
dbb6218e0d merp 2020-01-30 14:54:07 +08:00
kevinz000
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
Ghom
1caa2af4cf Update weaponry.dm 2020-01-30 04:05:35 +01:00
Ghommie
05567e2292 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit538 2020-01-30 03:42:50 +01:00
Ghom
793cc26ddc Update weaponry.dm 2020-01-30 03:28:47 +01:00
Ghom
096d9e01e1 Update weaponry.dm 2020-01-30 03:19:04 +01:00
Ghom
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
Ghommie
0dba1b5102 added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP. 2020-01-30 02:17:02 +01:00
kevinz000
0e1c46150f Merge pull request #10767 from KeRSedChaplain/gangnerf 
Removes stim packs from gangs
 2020-01-29 16:24:51 -07:00
kevinz000
0f4e30c2db Update crayons.dm 2020-01-29 16:13:29 -07:00
Ghom
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
Detective Google
cc2ce746d8 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l 2020-01-28 20:19:55 -06:00
Ghom
44c141f009 Merge branch 'master' into hugbox_meteor_time 2020-01-29 02:28:12 +01:00
Putnam
d358913bde linter is right, whoops 2020-01-28 17:26:32 -08:00
Ghom
3671f58612 Merge pull request #10751 from Citadel-Station-13/kevinz000-patch-14-1 
traitor+bro now have a minimum population of 25
 2020-01-29 02:16:38 +01:00
Ghom
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
kevinz000
3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527 
Ported further runtime fixes by AnturK.
 2020-01-28 17:57:26 -07:00
kevinz000
3d3086ac23 Merge pull request #10736 from Citadel-Station-13/Ghommie-patch-3 
An oversight with one of the new area helper procs.
 2020-01-28 17:55:39 -07:00
KeRSe
9c18d4fdad makes stimulants no longer purchasable by gangs 2020-01-28 15:53:29 -05:00
Ghom
fbe79edc24 Merge pull request #10752 from Owai-Seek/cargocratetglass 
6 More Crates
 2020-01-28 18:08:58 +01:00
kevinz000
a1a2d45be6 Update closets.dm 2020-01-28 02:41:04 -07:00
Putnam
8df9a051ec it compiles now, ready for testmerge probs 2020-01-27 19:09:04 -08: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
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
74fb726b8d Update traitor_bro.dm 2020-01-27 03:27:09 -07: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
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
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
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