Walter0o
852cccf94a
fixes tele-comp not checking power on initialize()
...
prevents exploiting the computer back on while area power is off
2014-08-10 02:07:13 +02:00
Chinsky
18070da974
Merge pull request #5922 from Jarcolr/customs
...
Complements the job specific satchels with 5 new job specific backpacks
2014-08-10 04:02:26 +04:00
Walter0o
aea4dc3344
meter improvements
...
- can unwrench meters now without needing to unwrench the pipe beneath
- AIs and ghosts can still click to examine
- other mobs don't read meter instead of doing whatever it is they are clicking for, e.g. shooting a gun
- 3 tile range check for non-AI/ghost still in place
- added feedback when no power or broken
2014-08-09 21:46:44 +02:00
Jarcolr
b4e9d9923f
Complements the satchels with backpacks
...
5 new backpacks: virologist, chemistry, geneticist, science,
hydroponics.
2014-08-08 22:20:11 +03:00
Chinsky
9f9865dac4
Merge pull request #5619 from mwerezak/power-net
...
ATMOSPHERICS and Power Net Overhaul
2014-08-08 09:49:42 +04:00
mwerezak
47b32122d4
Updates disposal bin pressurization
...
Also tweaks flasher power use.
2014-08-07 19:31:17 -04:00
Zuhayr
aa90ebb0c6
Merge pull request #5903 from Ccomp5950/mouse-trap-tag-fix
...
Fixed the font tag on mouse traps description.
2014-08-07 10:01:23 +09:30
Ccomp5950
74fd47e2de
Fixed the font tag on mouse traps description.
2014-08-05 18:55:15 -05:00
mwerezak
018079beb5
Fixes gas mixture bugs, other bugs, and cleanup
...
In particular, gas_mixture/remove() was not accounting for
group_multiplier when determining the maximum amount of gas to remove
Also cleans up the interface for gas_mixture/heat_capacity().
2014-08-05 17:04:17 -04:00
Ccomp5950
52da372bac
Fueltanks now log and admin_msg when shot at / weldered
2014-08-04 21:11:09 -05:00
mwerezak
f50a24163b
Updates medical equipment power usage
...
Also adds a couple of cell chargers to engineering workshop and aux tool
storage.
2014-08-04 21:27:19 -04:00
mwerezak
949cdd275b
Updates portable pumps and scrubbers
2014-08-04 20:55:45 -04:00
Ccomp5950
ec3262a2a9
Merge pull request #5894 from atlantiscze/cyborg_module_icons
...
Cyborg component icons!
2014-08-04 19:38:57 -05:00
Ccomp5950
4df46548ac
Merge pull request #5896 from Glloyd/fixes
...
Two Fixes
2014-08-04 19:37:02 -05:00
Ccomp5950
f95074d17e
Merge pull request #5887 from mwerezak/jetpack-icon
...
Fixes #5852
2014-08-04 15:17:02 -05:00
Ccomp5950
a4fc1bfd6a
Merge pull request #5886 from mwerezak/stun-baton
...
Fixes some handcuff oversights
2014-08-04 15:15:52 -05:00
Graham Lloyd
2c30af6124
Fireaxe cabinet hacking now fails if player moves away
2014-08-04 14:53:33 -04:00
Graham Lloyd
029a3f3abd
fixes wall rechargers showing up as normal rechargers.
2014-08-04 14:52:51 -04:00
Atlantiscze
3627417c7b
- Adds cyborg module icons. Each component has it's own specific icon now. Two icons are animated, four static. Includes broken versions.
...
- AI radio icon (chat icon) updated to use icon from robot_component.dmi file - removed duplicity from radio.dmi
- Cyborg radio icon (chat icon) updated to look like the radio module.
2014-08-04 09:25:53 +02:00
mwerezak
8d04a83e97
Updates gas coolers, upgrading of coolers/heaters
2014-08-03 14:34:31 -04:00
mwerezak
cf3a37d732
Fixes #5852
2014-08-03 12:32:37 -04:00
mwerezak
cf9fe8de76
Fixes some handcuff oversights
...
You now don't need to be grabbing to put handcuffs on yourself, and you
can now put hancuffs on if your grab state is higher than aggressive.
2014-08-03 11:49:37 -04:00
Walter0o
a586c1dd70
remove double paper/attack() definition
2014-08-03 13:52:47 +02:00
mwerezak
cb2f68f81e
Merge remote-tracking branch 'upstream/dev' into power-net
2014-08-03 01:50:51 -04:00
Zuhayr
05a1de6bf4
Merge pull request #5880 from Whitellama/master
...
Fixes #5870 (glasses being named inconsistently) and unreported issue of wet rags making glass-hit noises when you wash down a window
2014-08-03 13:05:43 +09:30
Zuhayr
eae182725a
Merge pull request #5865 from mwerezak/shock-fix
...
Fixes siemens_coefficent not affecting shock damage
2014-08-03 13:04:52 +09:30
Zuhayr
f510c05865
Merge pull request #5862 from mwerezak/stun-baton
...
Stun Baton Nerf
2014-08-03 12:59:54 +09:30
Zuhayr
2619fb61ce
Merge pull request #5872 from PsiOmegaDelta/Manifest
...
Fixes #5867
2014-08-03 12:57:19 +09:30
mwerezak
3647fa4d7d
Adds gas mixing proc and updates gas mixer
...
Also includes a whole bunch of fixes and updates for atmos machinery
2014-08-02 18:35:57 -04:00
Mloc
e2ea86eab1
Merge pull request #5699 from Zuhayr/calamity
...
Calamity mode.
2014-08-02 11:39:29 +01:00
Whitellama
a36becad2b
Wet rag no longer makes noise or hits when wiping down windows (nor does anything with the NOBLUDGEON flag)
2014-08-01 17:05:54 -07:00
Zuhayr
9eed4422ff
Lowercasing some Del() calls.
2014-08-02 00:15:49 +09:30
Zuhayr
96c7012608
Fixed part of the ninja objective.
2014-08-01 23:54:38 +09:30
Zuhayr
0868c344cc
Adjustments and a typo fix.
2014-08-01 23:50:33 +09:30
Mloc
6133083ca6
Merge pull request #5858 from Zuhayr/master
...
Fixes
2014-08-01 15:02:23 +01:00
Mloc
457d76f441
Merge pull request #5834 from Zuhayr/hydroponics
...
Changes dev hydro to use reagent procs.
2014-08-01 15:01:52 +01:00
Zuhayr
9eefdf4db8
A bit of prep work for integegrating player-set backgrounds into gameplay.
2014-08-01 22:54:57 +09:30
Zuhayr
96fbc0c640
Added two alt titles for Miner.
2014-08-01 22:41:07 +09:30
Zuhayr
3e4c80e874
Merge pull request #5848 from JimTheCactus/computer3_text_field_fix
...
DNA Field Fix and Field Validation
2014-08-01 21:59:34 +09:30
Zuhayr
2493dedf4b
Merge pull request #5847 from MrSnapwalk/psychotailor
...
Psychiatrist/Psychologist update
2014-08-01 21:59:10 +09:30
Zuhayr
21b02f3019
Merge pull request #5846 from Walter0o/href_fun
...
exploit-fix-o-rama
2014-08-01 21:59:00 +09:30
Zuhayr
dfb662fa4a
Merge pull request #5841 from mwerezak/escape-pods
...
Fixes emergency shuttle UI and tweaks escape pods
2014-08-01 21:58:02 +09:30
PsiOmega
8104928e75
Creates a shared proc for applying AI verbs. DRY. Arranges some consistency among verbs.
...
Fixes #5867 as well as a couple other missing verbs.
2014-08-01 10:36:44 +02:00
mwerezak
768019b918
Stunbaton fixes and cleanup
...
Apparently harm intent is "hurt", not "harm"
2014-07-31 19:17:05 -04:00
mwerezak
71e54111ab
Handcuffs now require an aggressive grab
2014-07-31 18:10:11 -04:00
mwerezak
5b90e4afc6
Allows the use of stun weapons to show up in autopsies
2014-07-31 17:01:06 -04:00
mwerezak
56ccd4303b
Merges taser and stun baton effects
...
Makes the code for handling stun weapon effects much cleaner.
Moves electrocute_act and emp_act from living.dm into living_defense.dm
2014-07-31 16:21:22 -04:00
mwerezak
c8cccb64f6
Adds siemens_coefficient handling to stun batons
2014-07-31 15:38:56 -04:00
mwerezak
b529d582e5
Fixes siemens_coefficent not affecting shock damage
...
Also cleans up electrocute_act()
2014-07-31 15:20:45 -04:00
mwerezak
9bfb4642a2
Merge remote-tracking branch 'upstream/dev' into stun-baton
...
Conflicts:
code/game/objects/items/weapons/stunbaton.dm
Made all obj/item/weapons have "swing_hit" as their default hitsound.
Made hitsound not play when the attack misses.
2014-07-31 14:31:21 -04:00
