kevinz000
20bcca0398
Merge pull request #9852 from Ghommie/Ghommie-cit369
...
Fixing some wizard den teleportation issues.
2019-11-19 21:39:20 -07:00
kevinz000
67abc4ff03
Merge pull request #9855 from Ghommie/Ghommie-cit371
...
Fixing suit store overlays
2019-11-19 21:38:22 -07:00
kevinz000
c1a416e257
Merge pull request #9858 from Ghommie/Ghommie-cit372
...
Fixing gasping xenos.
2019-11-19 21:37:17 -07:00
kevinz000
d692d3fe01
Merge pull request #9835 from Ghommie/Ghommie-cit363
...
Ports "Self sustaining fix"
2019-11-19 21:32:57 -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
a012347c52
Merge pull request #9837 from Ghommie/Ghommie-cit365
...
Ports "Fixes an Ancient LINDA Bug"
2019-11-19 21:32:23 -07:00
kevinz000
9e5f697838
Merge pull request #9842 from NopemanMcHalt/dab-op-plus
...
Fixes D.A.B. loadout name
2019-11-19 21:31:47 -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
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
a2f85cd19d
Merge pull request #9819 from Ghommie/Ghommie-cit358
...
Fixing the ghost roles/mid-round antag lock out suicide/cryo refactor.
2019-11-19 21:29:30 -07:00
kevinz000
877b79ae1c
Merge pull request #9822 from Putnam3145/dynamic-wizard-rework
...
Reworked how wizard spells interact with dynamic
2019-11-19 21:29:09 -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
Ghommie
b78da82336
Honkbot slip and slide fun ride.
2019-11-20 04:03:57 +01: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
Knouli
592c952d64
Update regenerative_core.dm
2019-11-19 20:03:04 -05:00
Hatterhat
f161b01f6b
ayytech plants
2019-11-19 17:26:44 -06:00
Ghommie
c21a137a62
Fixes super-lube waterflower.
2019-11-19 22:56:29 +01: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
Useroth
24bd42fc80
Adds strange seeds as a buyable traitor botanist item.
2019-11-19 19:19:40 +01:00
Ghommie
dd101ef221
Part 2
2019-11-19 18:00:56 +01: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
Fermi
9fb6c2f3a3
Okay I gotta hop
2019-11-19 12:22:53 +00:00
Knouli
a6d4e7edef
Update regenerative_core.dm
2019-11-19 06:00:56 -05:00
BlackMajor
1b1ed21f42
No adrenals for borgs please
2019-11-19 22:13:22 +13: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
BlackMajor
6cdb54bef1
Fix service borg lights breaking
2019-11-19 21:29:05 +13:00
BlackMajor
31c59b7cad
fixes upgrades removing dogborg stuff
2019-11-19 20:50:59 +13:00
Lin
512939f1e6
Merge pull request #9730 from Citadel-Station-13/kevinz000-patch-112
...
kinetic crushers no longer drop if you try to use it with one hand
2019-11-19 03:23:12 +00:00
Ghommie
a52e292cc8
Ports "examine-code refactor"... part 1...
2019-11-19 03:28:06 +01:00
Ghommie
63a3919ed2
Fixing gasping xenos.
2019-11-18 20:58:22 +01:00
Ghommie
21c1f8bc2a
Fixing suit store overlays
2019-11-18 15:19:39 +01:00
Ghommie
ec4e3898eb
Fixing some wizard den teleportation issues.
2019-11-18 02:04:49 +01:00
Anonymous
b714c32ca2
Partly Reverts "Fixes loadout name, adds DAB outf-
...
it crate to cargo"
This reverts commit 1bb8ff1c0c .
Removes cargo changes.
In other news, I can't please everyone and I hate society,
thank you for coming to my TED Talk.
2019-11-17 19:44:22 +03:00
NopemanMcHalt
8f7571a115
Don't do webedits, folks
...
I mean seriously it's quick but there's chance of fucking up something
2019-11-17 18:18:20 +03:00
Seris02
468b6eb609
mining winter coat shtuff
...
- adds the mining winter coat to mining wardrobes and mining lockers
2019-11-17 22:27:09 +08:00
Putnam
ba091b3a27
limited midround wizard summon events possibilities
2019-11-17 05:56:19 -08:00
Anonymous
1bb8ff1c0c
Fixes loadout name, adds DAB outfit crate to cargo
...
For "recruitment" on-station.
2019-11-17 15:08:30 +03:00
Seris02
dea5019bc9
cosmic winter coat yeeeehaw
2019-11-17 20:06:01 +08:00
Seris02
86a576e644
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix
2019-11-17 15:45:35 +08:00
Seris02
7d99508bd0
adds janitor winter coat
2019-11-17 15:45:12 +08:00
Seris02
b7f4580414
robotics winter coat
2019-11-17 11:50:56 +08:00
Ghommie
773b3e6605
Oh yea, now I remember why I did not port the webedit.. bhjiiiiiiin!
2019-11-17 04:11:37 +01:00
Ghommie
641ddebed1
Ports "Uses defines for turf atmos"
2019-11-17 03:19:35 +01:00
Ghommie
6d6cc93e50
Ports "Self sustaining fix"
2019-11-17 02:59:38 +01:00
Seris02
b146fd14f3
actually adds the winter coats
2019-11-16 18:25:05 +08:00
kevinz000
d9b24b20d1
Merge pull request #9817 from Ghommie/Ghommie-cit357
...
Fixing a keybinding issue.
2019-11-16 03:02:43 -07:00
Seris02
8db64df364
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix
2019-11-16 16:54:27 +08:00
Putnam
a85142053d
Makes it refund threat too (wow, didn't even think about it!)
2019-11-16 00:43:44 -08:00