83ce84cdc4
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02: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
0e1c46150f
Merge pull request #10767 from KeRSedChaplain/gangnerf
...
Removes stim packs from gangs
2020-01-29 16:24:51 -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
44c141f009
Merge branch 'master' into hugbox_meteor_time
2020-01-29 02:28:12 +01: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
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
7b49d4842a
Fire alarms.
2020-01-27 05:05:08 +01: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
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
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
b36d2dc277
Makes "Meow Mix" bar sign actually appear
2020-01-25 13:56:25 -08:00
00667eeecd
Merge pull request #10698 from Putnam3145/ghost-dojo-ban
...
Made ghost cafe mobs dust upon leaving, allowed ghost cafe bans
2020-01-25 15:25:26 +01:00
6529a34dbc
Reviever suggestions
...
HTML doesnt need compiling.
2020-01-25 15:18:18 +01:00
2acb52fb56
Merge pull request #10690 from Ghommie/Ghommie-cit525
...
Additional runtime fixes.
2020-01-25 05:54:35 -07:00
f199b720aa
Merge pull request #10689 from Ghommie/Ghommie-cit524
...
Even more runtime fixes.
2020-01-25 05:54:20 -07:00
a5404f6063
Merge pull request #10687 from Ghommie/Ghommie-cit523
...
A few more, ported, runtime fixes.
2020-01-25 05:54:03 -07:00
26459a156d
Merge pull request #10682 from Ghommie/Ghommie-cit519
...
Ports "Makes falsewall hide pipes and wires"
2020-01-25 05:53:07 -07:00
9ba6984f4f
Update door.dm
2020-01-25 05:49:38 -07: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
6fe0c57c42
run-extra-times fixes.
2020-01-24 20:48:32 +01:00
c69032ff42
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit374
2020-01-24 18:56:27 +01:00
ff8289c177
Fixes
2020-01-24 18:48:50 +01:00
d5daae98c7
Merge pull request #9905 from Trilbyspaceclone/glassware
...
[Ready] Cargo MK III - Glassware Addtion
2020-01-24 18:46:25 +01:00
0493db0ac6
allowed dojo banning, made dojo mobs dust upon leaving
2020-01-24 09:11:33 -08:00
9013c7aa9c
Merge pull request #10630 from Citadel-Station-13/kevinz000-patch-17
...
Nerfs cloning
2020-01-24 16:23:28 +01:00
fc684da88d
more reasonable
2020-01-24 04:31:54 -07:00
7649bf423e
Update world.dm
2020-01-24 04:13:59 -07:00
928a8ceea3
Merge pull request #10628 from Citadel-Station-13/Ghommie-patch-1
...
Quick rubber toolbox materials fix.
2020-01-24 00:26:22 -07:00
831ac91917
Merge pull request #10073 from Ghommie/Ghommie-cit435
...
Ports timestop and sepia extracts improvements/tweaks.
2020-01-24 00:25:53 -07:00
7cd6490e86
Merge pull request #10526 from Seris02/bowmanupgrade
...
allows headsets to be bowmanized and adds a traitor item for that
2020-01-24 00:21:34 -07:00
07277436ac
Merge pull request #10665 from Ghommie/Ghommie-cit513
...
Fixes chainsaw force being set to 0 on drop.
2020-01-24 00:20:26 -07:00
2a706ceb05
Merge pull request #10664 from kappa-sama/patch-17
...
makes cursed dragnet take 5 seconds instead of 30 to break out of
2020-01-24 00:18:05 -07:00
6677e82195
Turf magic and people spamclicking.
2020-01-24 05:19:47 +01:00
bd6e364612
But wait, there is more!
...
No...
2020-01-24 04:33:55 +01:00
67f58b8a59
A few more runtime fixes.
2020-01-24 03:30:34 +01:00
90c7149d8c
merge conflict fixes
2020-01-24 10:27:48 +08:00
Arturlang