Fermi
cac69eb158
Minor ID oops
2019-11-20 12:28:17 +00:00
Fermi
a0fe4c74ed
HECK
2019-11-20 12:15:20 +00:00
Fermi
68a30e9969
Final pass
2019-11-20 12:11:44 +00:00
Fermi
257b60ece6
ID
2019-11-20 11:58:58 +00:00
Fermi
4dd8223634
Undoes circuitboards and converts to sleeper.
2019-11-20 11:58:06 +00:00
Fermi
f055d214f2
ID and emag
2019-11-20 11:47:25 +00:00
Fermi
48e1c64c8d
Final
2019-11-20 11:35:40 +00:00
TrilbySpaceClone
a3aa70be75
Tweaks, and such
...
Tweaks many cargo packs, and fixes a few issues
Sneak peak into the kilm as well
2019-11-20 06:02:06 -05:00
Putnam
f7361c2059
Made sure every dynamic-controlled event doesn't randomly trigger on dynamic.
2019-11-19 21:58:55 -08:00
Ghommie
10373c7c96
Unmodularize closets.
2019-11-20 06:41:59 +01:00
Ghommie
f2aba997c7
consistency
2019-11-20 06:17:43 +01:00
Ghommie
fe171ac40a
Unmodularize several machinery and structures.
2019-11-20 06:13:57 +01:00
kevinz000
34a8dc5962
Merge pull request #9850 from Ghommie/Ghommie-cit368
...
fixing a few minor issues with console frames building.
2019-11-19 21:38:58 -07:00
kevinz000
7503366524
Merge pull request #9853 from Ghommie/Ghommie-cit370
...
Adds a few extra cardboard cutout variants.
2019-11-19 21:38:32 -07:00
kevinz000
779fac99b4
Merge pull request #9829 from Ghommie/Ghommie-cit361
...
Unborking id consoles.
2019-11-19 21:33:14 -07:00
kevinz000
755559bb66
Merge pull request #9836 from Ghommie/Ghommie-cit364
...
Ports "Uses defines for turf atmos"
2019-11-19 21:32:42 -07:00
kevinz000
c7765a032b
Merge pull request #9844 from Putnam3145/dynamic-midround-wizard-tweak
...
Dynamic summon events tweaks
2019-11-19 21:31:14 -07:00
kevinz000
56413c1460
Merge pull request #9846 from KathrinBailey/IKEA-station-13
...
IKEA Station 13: Import TG's Pews
2019-11-19 21:30:56 -07:00
kevinz000
4d1a9a0773
Merge pull request #9816 from Ghommie/Ghommie-cit356
...
Ports "Fixes MMIs not being able to use mecha equipment"
2019-11-19 21:30:13 -07:00
kevinz000
f883f55391
Merge pull request #9818 from GrayRachnid/portssaboteur
...
Ports the Saboteur borg for nukeops and new cyborg tools/weapon icons.
2019-11-19 21:28:25 -07:00
Putnam
36d860a4ba
Makes from-ghosts ruleset cancel if fewer than required candidates
2019-11-19 20:10:06 -08:00
Ghommie
7c0c14e059
Fixing aux-base construction RCD door access settings menu and reverting another non-functional bit
2019-11-20 03:35:06 +01:00
Ghommie
13f65c028f
Moves some clockie paper info to the right file.
2019-11-20 01:19:05 +01:00
kevinz000
95b9dd61a8
Update game_mode.dm
2019-11-19 13:01:06 -07:00
Useroth
5169205a19
Added a 10pack as well
2019-11-19 19:35:37 +01:00
Ghommie
21f15e411d
Part 3
2019-11-19 19:34:42 +01:00
Thalpy
20fa223fc4
Oop
2019-11-19 16:46:59 +00:00
Thalpy
3abae989df
Final settings
2019-11-19 16:44:10 +00:00
Thalpy
bf89df7e7b
Fixing things
2019-11-19 16:03:33 +00:00
Thalpy
c0287cf7b5
Reagent sleepers!
2019-11-19 14:50:22 +00:00
Thalpy
2eb33afcd6
Workin
2019-11-19 14:19:51 +00:00
Fermi
9fb6c2f3a3
Okay I gotta hop
2019-11-19 12:22:53 +00:00
BlackMajor
1b1ed21f42
No adrenals for borgs please
2019-11-19 22:13:22 +13:00
kevinz000
2494ea4d07
Merge pull request #9824 from YakumoChen/YakumoChen-mariplush
...
Adds Marisa plushie
2019-11-19 01:55:59 -07:00
kevinz000
40a01dedfe
Merge pull request #9806 from BlackMajor/Yote
...
Borg changes. Compresses Service/Janitor/Scrubpuppy borgs together. Removes borgi. Adds vore sleepers to service and engi dogborgs. Demodularizes some dogborg stuff too.
2019-11-19 01:54:47 -07:00
Linzolle
f9b632019b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-11-18 21:39:45 -06:00
Lin
c188c20f37
Merge pull request #9802 from Ghommie/Ghommie-cit349
...
Unmodularize bikehorns and holy weapons.
2019-11-19 03:24:38 +00:00
Ghommie
a52e292cc8
Ports "examine-code refactor"... part 1...
2019-11-19 03:28:06 +01:00
Ghommie
da56a33e43
stuff
2019-11-19 01:02:54 +01:00
Ghommie
cdfd5bbeac
mistakes were made.
2019-11-19 00:55:14 +01:00
Ghommie
f6b06a878c
Ports "Mime PDAs only accept emojis for messages, mime cartridge comes with an emoji guidebook"
2019-11-19 00:50:18 +01:00
Ghommie
bddb437872
It works now.
2019-11-18 18:30:46 +01:00
Trilbyspaceclone
d90812b0b2
reverts rapier nerfs
2019-11-18 06:26:25 -05:00
Ghommie
86072fe682
"
2019-11-18 04:15:33 +01:00
Ghommie
deadffe96f
missing parenthesis.
2019-11-18 03:26:04 +01:00
Ghommie
1c39a3bc6d
Adds a few extra cardboard cutout variants.
2019-11-18 03:23:24 +01:00
Ghommie
bd41cfbfc5
fixing a few minor issues with console frames building.
2019-11-17 22:44:37 +01:00
Ghommie
6e9d2d57c0
check_shields from human to living, part 2
2019-11-17 22:06:19 +01:00
Trilbyspaceclone
c575b3c798
base ball bats, katanan's and chainsaws will still fit
2019-11-17 13:54:18 -05:00
Trilbyspaceclone
7780a14a60
rapier huge
2019-11-17 13:49:32 -05:00