Crazy Lemon
5e1bd050f8
Merge branch 'master' into adminin
2017-03-03 23:23:40 -08:00
Crazy Lemon
af0c0d844b
Merge pull request #6630 from davipatury/newscaster-ui
...
Newscaster Nano-UI-ification
2017-03-03 21:20:53 -08:00
Crazy Lemon
57ad4776c5
Merge pull request #6632 from davipatury/tank_dispenser-ui
...
Atmos Nano-UI-ification
2017-03-03 21:11:13 -08:00
Fox McCloud
64f7eeeb75
Merge pull request #6658 from TravellingMerchant/master
...
Adds a new Cyborg sprite for all the basic departments.
2017-03-03 18:28:01 -05:00
Fox McCloud
345909d746
Merge pull request #6652 from LordJike/master
...
Makes french fries a deep fryer recipe instead of a processor recipe
2017-03-03 18:26:17 -05:00
Fox McCloud
c2e8ed611b
Merge pull request #6659 from uraniummeltdown/orm
...
Change ORM input/output dirs with multitool
2017-03-03 18:17:24 -05:00
Fox McCloud
cb7a3e6db8
Merge pull request #6661 from FlattestGuitar/karmameme
...
Adds confirmation prompts to karma purchases ✔️
2017-03-03 18:16:36 -05:00
Crazy Lemon
8ec9942750
Merge pull request #6637 from Krausus/TableCkeyification
...
Makes Karma and Notes Tables Always Use CKeys
2017-03-02 20:16:08 -08:00
FlattestGuitar
14bc738ca3
Adds confirmation thingies to karma purchases
2017-03-02 20:36:49 +01:00
FlattestGuitar
0a93603bc4
Fixes Spartan's gas mask fluff thing
2017-03-02 19:47:58 +01:00
uraniummeltdown
f5de924915
use multitool on open panel orm to change dir of input and output
2017-03-02 18:04:10 +04:00
TravellingMerchant
bc06adc562
Adds the new Cyborg sprites to the sprite select list.
2017-03-02 13:25:46 +00:00
Fox McCloud
72f904e0cc
Merge pull request #6640 from FlattestGuitar/clickety-click
...
[s]Actually suppresses .click macros
2017-03-02 00:50:29 -05:00
Fox McCloud
e41b09d876
Merge pull request #6622 from Kyep/terrorspiders-PR4
...
Terror Spiders 4 - Fixes & Tweaks
2017-03-01 18:29:53 -05:00
LordJike
c60b477b7d
Update processor.dm
2017-03-01 19:26:33 -04:00
LordJike
12ac7e2a00
Update deep_fryer.dm
2017-03-01 19:26:28 -04:00
Fox McCloud
33b7213065
Merge pull request #6613 from Crazylemon64/autopsy_data
...
Adds stuff to autopsy
2017-03-01 18:23:11 -05:00
Fox McCloud
3ec0afeecf
Merge pull request #6639 from KasparoVy/multivox-plasmaverse
...
Properly Equips Plasmaman & Vox Multiverse Copies
2017-03-01 18:22:09 -05:00
Fox McCloud
eb7edab605
Merge pull request #6364 from Aurorablade/NerfsPowerNaps
...
Stop Dashing Waves
2017-03-01 18:21:21 -05:00
Tigercat2000
c3bcd15c5e
fix nukeops
2017-03-01 14:44:09 -08:00
Fox McCloud
58201f87d3
Merge pull request #6638 from gt33/patch-1
...
Fixes the Mime's EVA Suit description
2017-03-01 04:41:25 -05:00
Fox McCloud
4f373a8fb0
Merge pull request #6616 from Crazylemon64/spacevine_loot
...
Encourages crew to foster highly dangerous biothreats
2017-03-01 04:40:59 -05:00
Fox McCloud
1cbabb40cb
Merge pull request #6627 from SamHPurp/Adds-Wood-to-Cargo
...
Allows Cargo to order Wood Planks
2017-03-01 04:40:07 -05:00
Kyep
e6950ef663
reduces TS event chance
2017-02-28 22:51:01 -08:00
FlattestGuitar
a21b47dfd6
Actually suppresses the .click macros
...
😐
2017-02-28 17:59:43 +01:00
davipatury
54713561ed
Passive gate, pump, volume pump, filter and mixer nano-uis.
2017-02-28 12:41:41 -03:00
KasparoVy
88669090a6
Properly Equips Plasmaman & Vox Multiverse Copies
2017-02-28 04:37:10 -05:00
gt33
0f1b2b599d
Fixes the Mime's EVA Suit description
2017-02-28 04:27:36 -05:00
KasparoVy
f425f0ae4e
Plasmaman Suit only extinguishes when you're on fire.
...
Had to make it disregard negative firestacks because showers (and
probably some other things). This check is extremely similar to one just
a few lines above, so it makes sense.
2017-02-28 00:50:03 -05:00
Krausus
2373aa6194
Makes notes table always use ckeys
...
This replaces several sanitizeSQL calls with ckey calls, which
effectively sanitizes on its own.
Admin ckeys are not ckeyized if they don't actually match the admin's
ckey, which only really happens with specific automated notes.
2017-02-28 00:49:54 -05:00
Fox McCloud
1634788ba5
Merge pull request #6635 from Krausus/ClickSubstituteTweaks
...
[s].click Substitute Tweaks
2017-02-28 00:21:28 -05:00
Fox McCloud
45286f3a7f
Merge pull request #6634 from Crazylemon64/airlock_runtime_fix
...
Fixes roundstart airlock runtime
2017-02-28 00:19:48 -05:00
Krausus
0019f13a36
Makes karma and whitelist tables use ckeys
2017-02-27 23:50:40 -05:00
Crazylemon64
31679e729f
Fixes roundstart airlock runtime
2017-02-27 20:06:34 -08:00
Krausus
18ba27fd70
Click substitute tweaks
2017-02-27 23:04:55 -05:00
davipatury
d78d800d8a
Tank dispenser nano-ui.
2017-02-27 19:14:20 -03:00
FlattestGuitar
8d4127c80d
Disables the .click macro
2017-02-27 23:07:25 +01:00
davipatury
77bf04ea3d
Newscaster nano-ui.
2017-02-27 17:29:15 -03:00
Sam
a59cc3c15f
adds wood planks to Cargo ordering
...
Only 30, and 15 points, which is more expensive than metal. Wood in
space is rare!
2017-02-27 12:37:18 +00:00
uraniummeltdown
d0d2c63f30
remove trailing returns, alter checks, setdir, light_range
2017-02-27 15:03:28 +04:00
uraniummeltdown
0c7ec9d330
Merge remote-tracking branch 'remotes/upstream/master' into statues
...
# Conflicts:
# _maps/map_files/cyberiad/cyberiad.dmm
2017-02-27 14:27:24 +04:00
Kyep
66ee1659b6
Post-PR-3 bugfix & rebalance pass
...
Changes:
1) Fixes wireless AEGs being able to be recharged in conventional
rechargers. This prevents people with recharger access using them as
regular laserguns.
2) Fixes spiderlings from dying Mother of Terrors lingering around for a
long time. Now, they're forced to ventcrawl immediately if they can.
3) Improves queen health regen. She was regularly getting picked off by
one guy with a gun or two.
4) Queen and Mother now gain vent smash ability. Given how often the
crew welds literally every vent, this is necessary to avoid them being
totally shut out of the vent system in the late game.
5) Prince loses vent smash ability. Instead, he gets the ability to spin
thicker (vision-blocking) webs, and +10 melee damage.
6) Fixes 'evil looking spiderling' meta by requiring that queen has laid
at least 10 eggs before the ability is usable, so newbie queens
don't use it first thing and instantly get discovered/swarmed.
7) Adds confirmation prompt to queen nesting. Queens will no longer be
confused about why the cannot ventcrawl after nesting.
8) Reduces the chances of terror spiderlings skittering onto space
tiles. Makes them less likely to space themselves.
9) Tweaks TS event by increasing timer, and having one of the possible
infestation types spawn 4, rather than 3, green terrors.
2017-02-26 21:42:45 -08:00
Fox McCloud
cdf5b55ac1
Merge pull request #6535 from KasparoVy/rigfix
...
Fixes Rigsuit NODROP-Related Bug and Improves Rigsuit Verb Readability
2017-02-26 18:04:51 -05:00
Krausus
32df184a47
Fixes religious choices blocking round startup
2017-02-26 17:48:39 -05:00
Fox McCloud
8729dff99e
Merge pull request #6588 from Crazylemon64/random_barrier
...
Adds a random barrier for use in mapping
2017-02-26 17:27:20 -05:00
Crazylemon64
31417488c4
Adds hooks in Adjust*Loss to support autopsy
2017-02-26 09:43:00 -08:00
Crazy Lemon
e6e3ebd462
Merge pull request #6599 from davipatury/datacore-effect
...
Refactors datacore into a datum
2017-02-26 09:38:56 -08:00
Fox McCloud
21941f4547
Merge pull request #6566 from Kyep/aiupload_zlevel_restrict
...
Stops AI & Borg upload consoles working on other zlevels
2017-02-26 12:35:17 -05:00
Fox McCloud
116d852d60
Merge pull request #6587 from Crazylemon64/immovable_rod_is_finite
...
Immovable rods no longer loop forever
2017-02-26 12:08:28 -05:00
Fox McCloud
5772b6170b
Merge pull request #6618 from Crazylemon64/firedoor_robofix
...
Robots can now work with firelocks again
2017-02-26 11:56:36 -05:00
