Commit Graph

15485 Commits

Author SHA1 Message Date
Markolie
8ed466955e Surgery toolspeed changes 2017-03-08 10:46:43 +01:00
Markolie
acab5d5170 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz
# Conflicts:
#	code/game/objects/items/weapons/storage/bags.dm
#	code/game/objects/items/weapons/storage/uplink_kits.dm
#	code/game/objects/items/weapons/storage/wallets.dm
2017-03-08 10:45:16 +01:00
Crazy Lemon
6e7338a573 Merge pull request #6688 from Allfd/bible
Makes bible farting less predictable
2017-03-08 00:24:44 -08:00
Fox McCloud
aa6e25a7f3 Merge pull request #6648 from Kyep/event_rebalance
Tweaks Event Odds
2017-03-08 01:02:02 -05:00
Kyep
689f515388 Changed Traders chance back to 0 2017-03-07 21:41:18 -08:00
Fox McCloud
f96c335d1f Merge pull request #6704 from uraniummeltdown/hardsuit
Rename all "rigs" (hardsuits) to hardsuits
2017-03-07 23:35:07 -05:00
Fox McCloud
c973875b95 Merge pull request #6675 from Crazylemon64/monster_allocator_port
Ports Monster's finishing of the space allocator
2017-03-07 23:21:50 -05:00
Crazy Lemon
fc272c33be Merge pull request #6700 from Fox-McCloud/money-money-money
Refactors Money
2017-03-07 20:04:29 -08:00
Fox McCloud
5a9ff41464 Merge pull request #6591 from Crazylemon64/ipc_power_cord
Replaces the IPC APC grabbing thing with a power cord and lets IPCs be genderless
2017-03-07 22:25:11 -05:00
uraniummeltdown
dc6f9f5506 rename all hardsuits (called rig in multiple places) to hardsuit, rename rig.dm to hardsuit.dm, adjust icon states from rig to hardsuit, move paranormal hardsuit mob sprites out of own file, add wiz hardsuit helm and suit inhands 2017-03-07 20:55:43 +04:00
Markolie
3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
Markolie
3b73053bc4 Tool fixes 2017-03-06 20:46:24 +01:00
Fox-McCloud
41d4c83f17 Refactors Money 2017-03-06 04:52:03 -05:00
Markolie
44e8080de2 Fix design names 2017-03-05 23:05:19 +01:00
Markolie
9ec1400ae1 Fix comments 2017-03-05 23:04:41 +01:00
Markolie
d877ef1de3 Fixes 2017-03-05 20:14:06 +01:00
Markolie
9d9e957df1 Tool overhaul (usesound & toolspeed), wire descriptions/ghost interaction, add additional tools, refactor can(t)_hold 2017-03-05 19:53:20 +01: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
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
Alffd
35f34a3a24 Removes adminlog 2017-03-04 17:34:36 -05:00
Alffd
900aeb1239 Makes bible farting less predictable 2017-03-04 16:38:15 -05:00
Crazy Lemon
0d5d8e6cbe Merge pull request #6597 from davipatury/wires-ui
Wires Nano-UI-ification
2017-03-04 10:21:19 -08:00
Crazy Lemon
5e1bd050f8 Merge branch 'master' into adminin 2017-03-03 23:23:40 -08:00
Crazylemon64
36255fffad Ports Monster's finishing of the space allocator 2017-03-03 17:47:10 -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
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
Kyep
5455815b14 Halved increases for rad storm and anomalies 2017-03-01 23:09:23 -08:00
Kyep
a4839ccb61 Fixes merge conflict 2017-03-01 23:07:57 -08: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
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
Kyep
a6406479ba Reverts change to carp migration event chance 2017-03-01 00:55:22 -08:00
Kyep
9613496ffe Rebalances event chances, pass 1
Major Events:
- Enables trader event to happen randomly.
- Increases chances of carp migration and meteor wave events.
- Halves the chances of Xenomorph events.

Medium Events:
- Reduces chances of rogue drones (that don't do much currently)
- Increases chances of radiation storms (that make people enter maint)
- Increases chances of most kinds of anomaly (flux, bluespace, pyro,
etc)
- Increases chances of meteor shower
- Decreases chances of meaty ores (they do very little)
2017-02-28 23:01:38 -08:00
Kyep
e6950ef663 reduces TS event chance 2017-02-28 22:51:01 -08:00