Ghommie
911a33bfd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit387
2019-11-21 06:36:59 +01:00
Ghommie
dccb3c2e22
part 3
2019-11-21 06:36:22 +01:00
kevinz000
c22ae596fc
Merge pull request #9880 from Putnam3145/meteor-random-fix
...
Makes sure every dynamic-triggered event isn't random on dynamic
2019-11-20 22:12:42 -07:00
kevinz000
1efd3ae395
Merge pull request #9866 from Useroth/tatorstrangeseeds
...
Adds strange seeds as a buyable traitor botanist item.
2019-11-20 22:09:53 -07:00
kevinz000
30aefd050a
Merge pull request #9868 from Ghommie/Ghommie-cit376
...
Fixes superlube waterflower.
2019-11-20 22:08:54 -07:00
nik707
8d363b8e9d
Merge pull request #9323 from Citadel-Station-13/kevinz000-patch-85
...
adds poll ignore for magical antagonists
2019-11-20 23:03:39 -06:00
nik707
0300927974
Merge pull request #9487 from Citadel-Station-13/spooky
...
adds an easy way for admins to force enable halloween races without the rest of halloween's code
2019-11-20 23:00:09 -06:00
nik707
56d2c0edad
Merge pull request #9681 from Citadel-Station-13/kevinz000-patch-107
...
buffs bluespace apprentice (targeted teleport --> blink)
2019-11-20 22:55:21 -06:00
nik707
28190bc168
Merge pull request #9703 from Citadel-Station-13/kevinz000-patch-109
...
emagged medibots now murder the everloving fuck out of slimepeople
2019-11-20 22:52:11 -06:00
nik707
df11e75414
Merge pull request #9718 from Citadel-Station-13/kevinz000-patch-110
...
fixes a bug with rnd multiprinting
2019-11-20 22:51:32 -06:00
nik707
6d889e66c4
Merge pull request #9720 from Citadel-Station-13/kevinz000-patch-111
...
Is it the time of year to buff disablers again?
2019-11-20 22:51:11 -06:00
kevinz000
8df8acb1b7
Merge pull request #9811 from Ghommie/Ghommie-cit353
...
Dreamchecker compatibility changes, part 2.
2019-11-20 21:49:58 -07:00
kevinz000
c503e564db
Merge pull request #9873 from Ghommie/Ghommie-cit378
...
Fixing aux-base construction RCD door access settings menu and reverting another non-functional bit
2019-11-20 21:48:41 -07:00
kevinz000
47888bd208
Merge pull request #9877 from Ghommie/Ghommie-cit381
...
Unmodularize pAI holo-chassis icons.
2019-11-20 21:47:00 -07:00
kevinz000
f82dd255dc
Merge pull request #9869 from Hatterhat/ayy-dna-manip
...
what if i gave botanists the ability to get the fancy alien dna manipulator. haha, just kidding. ...unless?
2019-11-20 21:46:37 -07:00
Useroth
2a8152c835
Applied suggestions.
2019-11-20 15:15:10 +01:00
Putnam
0d297e92c7
read words
2019-11-19 22:02:06 -08:00
Putnam
f7361c2059
Made sure every dynamic-controlled event doesn't randomly trigger on dynamic.
2019-11-19 21:58:55 -08:00
Ghommie
75ac087988
Unmodularize pAI holo-chassis icons.
2019-11-20 05:54:00 +01:00
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
7c0c14e059
Fixing aux-base construction RCD door access settings menu and reverting another non-functional bit
2019-11-20 03:35:06 +01: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
Useroth
24bd42fc80
Adds strange seeds as a buyable traitor botanist item.
2019-11-19 19:19:40 +01: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
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
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
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
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
