c7765a032b
Merge pull request #9844 from Putnam3145/dynamic-midround-wizard-tweak
...
Dynamic summon events tweaks
2019-11-19 21:31:14 -07:00
dc79b9df76
Automatic changelog generation for PR #9846 [ci skip]
2019-11-19 22:30:59 -06:00
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
b277379992
Automatic changelog generation for PR #9816 [ci skip]
2019-11-19 22:30:16 -06:00
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
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
6831e785de
Automatic changelog generation for PR #9822 [ci skip]
2019-11-19 22:29:12 -06:00
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
63899bdc3d
Merge pull request #9827 from Ghommie/Ghommie-cit360
...
one line shuttle fix port
2019-11-19 21:28:50 -07:00
b2c4cc7537
Automatic changelog generation for PR #9818 [ci skip]
2019-11-19 22:28:35 -06:00
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
64433ec8ab
Automatic changelog generation for PR #9814 [ci skip]
2019-11-19 12:38:22 -06:00
cb70f47a48
Merge pull request #9814 from Citadel-Station-13/kevinz000-patch-115
...
modifies donator config entry to allow multiple ckeys per line
2019-11-19 13:38:20 -05:00
2494ea4d07
Merge pull request #9824 from YakumoChen/YakumoChen-mariplush
...
Adds Marisa plushie
2019-11-19 01:55:59 -07:00
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
6cdb54bef1
Fix service borg lights breaking
2019-11-19 21:29:05 +13:00
84e84355c3
Update code/controllers/configuration/config_entry.dm
...
Co-Authored-By: Lin <linzolle@gmail.com >
2019-11-19 01:07:43 -07:00
31c59b7cad
fixes upgrades removing dogborg stuff
2019-11-19 20:50:59 +13:00
b5f6c12b30
Automatic changelog generation for PR #9782 [ci skip]
2019-11-18 21:25:12 -06:00
c57e0f5add
Merge pull request #9782 from Ghommie/Ghommie-cit342
...
fixing stupid pink milk and tea missing sprites.
2019-11-19 03:25:09 +00:00
dd0d1b6a9c
Automatic changelog generation for PR #9802 [ci skip]
2019-11-18 21:24:40 -06:00
c188c20f37
Merge pull request #9802 from Ghommie/Ghommie-cit349
...
Unmodularize bikehorns and holy weapons.
2019-11-19 03:24:38 +00:00
1a40865fae
Automatic changelog generation for PR #9730 [ci skip]
2019-11-18 21:23:15 -06:00
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
ebd78958ea
bruh ghoo mee why you mean?
2019-11-17 21:30:05 +00:00
e62f01648a
Fixed removed armrests for regular sofas.
...
Oh dear, thanks Panic!, I really messed that one up.
2019-11-17 18:09:21 +00:00
0d508e9108
DME update
2019-11-17 14:21:08 +00:00
05c74c731b
Ports TG pew files
2019-11-17 14:20:44 +00:00
ba091b3a27
limited midround wizard summon events possibilities
2019-11-17 05:56:19 -08:00
c76c94bc35
Merge remote-tracking branch 'upstream/master'
2019-11-17 06:12:11 +00:00
0ecb569a95
changes syndi mediborg cross to a black cross
2019-11-16 13:44:23 -05:00
3e6a298a6d
one line shuttle fix port
2019-11-16 17:18:26 +01:00
f09a98fc58
this time without reverting several PRs
2019-11-16 06:50:27 -05:00
fb2aa5267b
minor sprite edit
2019-11-16 06:44:47 -05:00
d9b24b20d1
Merge pull request #9817 from Ghommie/Ghommie-cit357
...
Fixing a keybinding issue.
2019-11-16 03:02:43 -07:00
5c89447cf9
Update plushes.dm
2019-11-16 09:56:57 +00:00
5586747747
adds marisa to plush.dmi
2019-11-16 04:46:52 -05:00
3326564f86
Merge pull request #13 from Citadel-Station-13/master
...
up
2019-11-16 04:39:32 -05:00
a85142053d
Makes it refund threat too (wow, didn't even think about it!)
2019-11-16 00:43:44 -08:00
c9de03675e
actually no i'm reworking this
2019-11-16 00:36:09 -08:00
ca2dab13fb
Automatic changelog generation for PR #9813 [ci skip]
2019-11-16 02:25:01 -06:00
21775ad3ee
Merge pull request #9813 from Ghommie/Ghommie-cit355
...
Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]"
2019-11-16 01:24:58 -07:00
8f5d59ffd4
Automatic changelog generation for PR #9769 [ci skip]
2019-11-16 02:17:26 -06:00
66f8b5f404
Merge pull request #9769 from Ghommie/Ghommie-cit336
...
ID console fixes and other tweaks.
2019-11-16 01:17:23 -07:00
23f84cb7fb
Automatic changelog generation for PR #9557 [ci skip]
2019-11-16 02:08:27 -06:00
8ac6a56993
Merge pull request #9557 from Putnam3145/super-special-awesome-dynamic
...
Dynamic voting (needs testing)
2019-11-16 01:08:25 -07:00
c1dfa4227b
ok this works and i don't know why
2019-11-16 00:52:52 -05:00
206f3df25c
i hate dogborgs and pixel_x
2019-11-16 00:41:55 -05:00
d0580e8ecb
Comments were awful.
2019-11-15 23:32:46 +01:00
7a1f3dcdba
Fixing the ghost roles/mid-round antag lock out suicide/cryo refactor.
2019-11-15 23:14:28 +01:00
kevinz000