27c915ec75
honk
2020-01-30 02:04:48 -06:00
dbb6218e0d
merp
2020-01-30 14:54:07 +08: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
0e1c46150f
Merge pull request #10767 from KeRSedChaplain/gangnerf
...
Removes stim packs from gangs
2020-01-29 16:24:51 -07: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
cc2ce746d8
Merge remote-tracking branch 'upstream/master' into the-p-o-o-l
2020-01-28 20:19:55 -06:00
44c141f009
Merge branch 'master' into hugbox_meteor_time
2020-01-29 02:28:12 +01:00
d358913bde
linter is right, whoops
2020-01-28 17:26:32 -08:00
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
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
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
9c18d4fdad
makes stimulants no longer purchasable by gangs
2020-01-28 15:53:29 -05:00
fbe79edc24
Merge pull request #10752 from Owai-Seek/cargocratetglass
...
6 More Crates
2020-01-28 18:08:58 +01:00
a1a2d45be6
Update closets.dm
2020-01-28 02:41:04 -07:00
611fd7ea89
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-27 23:35:35 -07:00
8df9a051ec
it compiles now, ready for testmerge probs
2020-01-27 19:09:04 -08: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
74fb726b8d
Update traitor_bro.dm
2020-01-27 03:27:09 -07:00
6567f9dd0d
Merge pull request #10711 from Citadel-Station-13/kevinz000-patch-8
...
buffs door crushing
2020-01-27 05:38:59 +01:00
8f26325822
more stuff
2020-01-26 21:05:51 -07:00
7b49d4842a
Fire alarms.
2020-01-27 05:05:08 +01:00
233aeaa456
removed some suggested bad possible contraband
2020-01-26 19:03:09 -08: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
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
7471f59bc3
ignore eligibility checks
2020-01-26 13:56:04 -07: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
a89cd796d4
emergency shuttle console spam limiter.
2020-01-26 21:33:36 +01:00
01152d6d0f
traitor items
2020-01-26 00:41:58 -07:00
9ee9f79fdc
checks
2020-01-25 23:52:33 -07:00
2e6cfef224
Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit
2020-01-25 22:13:28 -07:00
8b4a050ad3
ok
2020-01-25 22:03:53 -07:00
5fd81c5233
Merge pull request #10717 from Putnam3145/meow-mix-fix
...
Makes "Meow Mix" bar sign actually appear
2020-01-26 05:45:55 +01:00
52e473ba07
argh
2020-01-25 19:42:36 -08:00
Commandersand