Commit Graph

24952 Commits

Author SHA1 Message Date
Markolie
02c4cd26f4 Final fixes 2017-03-05 16:42:14 +01:00
Markolie
b787b8f8e4 Refactor mineral door code 2017-03-05 15:02:17 +01:00
Markolie
e6b39c3185 Fixes 2017-03-05 14:31:26 +01:00
Fox McCloud
15cda911f4 Merge pull request #6668 from Kyep/objective_announce
Makes objective changes more obvious
2017-03-05 03:06:55 -05:00
Fox McCloud
03b5a5efaa Merge pull request #6660 from uraniummeltdown/monkey
Allows monkeys to use all guns
2017-03-05 03:03:45 -05:00
Fox McCloud
dfa46a3181 Merge pull request #6686 from MarsM0nd/Bags
Small backpack sprite fix
2017-03-05 02:57:21 -05:00
Fox McCloud
f18ae48808 Merge pull request #6655 from Kyep/poison_pen
Poison Pen, QM/HoP/CargoTech Traitor Item
2017-03-05 02:36:45 -05:00
Kyep
18eb3fa4e0 Cost: 5->2 TC, Reagent:Sarin->Amanitin 2017-03-04 22:50:20 -08:00
Mars
52b15a8f35 Small sprite fix
Gives the grey satchel the grey satchel sprite instead of the leather
one.
2017-03-04 19:36:30 +01:00
Crazy Lemon
0d5d8e6cbe Merge pull request #6597 from davipatury/wires-ui
Wires Nano-UI-ification
2017-03-04 10:21:19 -08:00
davipatury
3a10ee852a Crazylemon's suggestion. 2017-03-04 14:17:57 -03:00
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
Kyep
f2bd748a11 Adds alarm sound to objective changes
🆑
tweak: Antags whose objectives are manually announced by an admin, or
altered automatically as a result of their target cryoing, will now hear
a warning sound. The sound is the same as the 'crew transfer vote
called' sound. Additionally, the text notice for changed objectives is
more obvious.
/🆑
2017-03-02 22:48:46 -08: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
4d80e4ac36 allow monkeys to use guns 2017-03-02 20:45:42 +04: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
Kyep
5ca4d306db More logging 2017-03-01 23:56:55 -08:00
Kyep
04543d1466 Initial version, from TG
Ports Poison Pen from TG:
https://github.com/tgstation/tgstation/pull/23778
Adds a HoP/Cargotech/QM-only traitor pen that can be used on paper to
poison it.
Picking up poisoned paper without gloves transfers the poison through
your skin, into your bloodstream. Subsequent people to pick it up are
not affected.
The poison is 15 units of the nerve agent, sarin. This is enough to kill
you in a couple of minutes. It is quite obvious.
The pen looks like a normal pen, costs 5 TC, and has 3 uses. It cannot
be used as a direct weapon. It has to be applied to paper to be
effective.

🆑 Kyep
rscadd: Added Poison Pen, a stealthy way of applying a contact-based
poison to paper. Available to Syndicate HoPs, QMs, and Cargo Techs.
/🆑
2017-03-01 23:44:31 -08: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