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
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
ab4aa29576
clown ops infiltrator consistency.
2020-02-01 00:02:31 +01:00
54cd2585cf
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-01-31 23:18:51 +01:00
5f58173038
I kinda completely fucked my original stunbaton PR. This is just a rePR of it.
2020-01-31 11:55:52 -06:00
4c4fda8091
line ending
2020-01-31 14:14:34 +00:00
89134d8b30
updates fancy
...
the boxes actually work now
2020-01-31 08:52:45 -05:00
d26ca9dbf0
Fixes this
2020-01-31 13:57:30 +01:00
1ed4b90e5f
update fancy
2020-01-31 07:14:58 -05:00
065691ca1e
adds ring boxes to fancy
2020-01-31 06:33:13 -05:00
188f726ffd
unicode support port wip
2020-01-31 05:32:00 +01:00
81039b131b
fixes
2020-01-31 09:49:08 +08:00
15e5f0ef5d
Merge pull request #10644 from ShadeAware/master
...
Craftable Switchblades: The Finale
2020-01-30 21:30:55 +01:00
83ce84cdc4
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02:00
27c915ec75
honk
2020-01-30 02:04:48 -06:00
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
1caa2af4cf
Update weaponry.dm
2020-01-30 04:05:35 +01:00
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
793cc26ddc
Update weaponry.dm
2020-01-30 03:28:47 +01:00
096d9e01e1
Update weaponry.dm
2020-01-30 03:19:04 +01:00
b2ca380a13
Update weaponry.dm
2020-01-30 03:15:24 +01:00
58b969b8c6
Update RPD.dm
2020-01-29 20:34:57 -05:00
0dba1b5102
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
2020-01-30 02:17:02 +01:00
0f4e30c2db
Update crayons.dm
2020-01-29 16:13:29 -07:00
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
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
3bf0e1d5c4
Merge pull request #10701 from Ghommie/Ghommie-cit527
...
Ported further runtime fixes by AnturK.
2020-01-28 17:57:26 -07:00
611fd7ea89
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-27 23:35:35 -07:00
e50eb495df
pre attack refactor
2020-01-27 16:30:23 -07:00
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
5bc590ad52
Merge branch 'master' into cargocratetglass
2020-01-27 08:03:30 -05:00
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
92398ae354
Why am I having such trouble with a fucking SPAN CLASS
2020-01-26 19:46:30 -05:00
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
e45cc4933c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup
2020-01-27 08:33:38 +08:00
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
2cd6ed5f26
REEEE STRAY SLASHES
...
WHY CAN'T I DO THINGS RIGHT THE FIRST TIME
2020-01-26 16:31:00 -05:00
732dd8a3bb
Hmm, today I will forget quotes on my strings.
...
Thank you Putnam.
2020-01-26 16:11:22 -05:00
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
2e6cfef224
Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit
2020-01-25 22:13:28 -07:00
603ab65ed1
Merge pull request #10151 from Ghommie/Ghommie-cit450
...
refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
2020-01-25 19:33:26 -07:00
2acb52fb56
Merge pull request #10690 from Ghommie/Ghommie-cit525
...
Additional runtime fixes.
2020-01-25 05:54:35 -07:00
4376434e01
woops
2020-01-24 22:31:05 -07:00
b33e6cd79e
scanner fix
2020-01-24 22:00:03 -07:00
75e1108f33
optizmize
2020-01-24 21:45:43 -07:00
32e4355024
lists are references use copy
2020-01-24 21:44:37 -07:00
f2b04be561
More Runtimenator fixes.
2020-01-25 02:16:45 +01:00
ac6695bd68
Merge pull request #10679 from Ghommie/Ghommie-cit517
...
neuter/plural gender fixes.
2020-01-24 16:15:44 -07:00
e360ac1d36
Conflict fix
2020-01-24 23:06:32 +01:00
856ef236f3
Further runtime fixes by AnturK.
2020-01-24 23:01:30 +01:00
Ghom