mwerezak
6d6413a59b
Fixes laptop power draw, improves cell chargers
...
Cell chargers no longer call use_power() in their process()
2014-08-17 15:30:29 -04:00
mwerezak
58e0b659d4
Reorganizes shieldgen source code and icon files
2014-08-10 11:58:25 -04:00
mwerezak
e1dc7d436b
Fixes icons and other things not updating when the master controller updates power status.
...
This was due to the master controller using update_powered_status()
instead of power_change(), but many machines override power_change() to
do various things when the machine gains or loses power.
2014-08-10 03:45:20 -04:00
mwerezak
4b070a2de6
Fixes #5935
...
Also improves apc/process() (doesnt add and then remove charge from
cells when it doesn't have to).
2014-08-10 03:44:56 -04:00
mwerezak
a08204fc16
Updates emergency and wall shield power usage
2014-08-10 00:39:57 -04:00
mwerezak
47b32122d4
Updates disposal bin pressurization
...
Also tweaks flasher power use.
2014-08-07 19:31:17 -04: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
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
mwerezak
8d04a83e97
Updates gas coolers, upgrading of coolers/heaters
2014-08-03 14:34:31 -04:00
mwerezak
cb2f68f81e
Merge remote-tracking branch 'upstream/dev' into power-net
2014-08-03 01:50:51 -04:00
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
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
457d76f441
Merge pull request #5834 from Zuhayr/hydroponics
...
Changes dev hydro to use reagent procs.
2014-08-01 15:01:52 +01:00
Zuhayr
2493dedf4b
Merge pull request #5847 from MrSnapwalk/psychotailor
...
Psychiatrist/Psychologist update
2014-08-01 21:59:10 +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
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
mwerezak
7130fd124b
Stun baton nerf
...
Adds agonyforce var to stun batons, which causes halloss and eye blur.
Also did some clean up of stun batons, and fixed the stun baton's bcell
var being of type weapon/cell/high instead of weapon/cell.
2014-07-31 13:39:06 -04:00
Zuhayr
202398d0e2
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-31 23:08:14 +09:30
MrSnapwalk
84ceb30d27
Psychiatrist/Psychologist update.
2014-07-30 20:57:20 -05:00
Rob Nelson
68a13a6d60
Vending machine href exploit fix
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/game/machinery/vending.dm
2014-07-30 21:47:29 +01:00
Zuhayr
f2393d9465
Replaces antag intro text and objective announcement with a proc.
2014-07-30 21:36:31 +09:30
Zuhayr
e885fc8115
Added Calamity mode.
2014-07-30 21:09:25 +09:30
Zuhayr
3105297f3e
Adjusted spawn procs for heist and nuke.
2014-07-30 21:08:28 +09:30
Zuhayr
251b44a53c
Changed hydro trays, fertilizer and syringes over to use the reagent procs.
2014-07-30 12:24:03 +09:30
PsiOmega
3ad8f4ca24
Merge branch 'dev' into Pics
...
Conflicts:
code/modules/paperwork/photography.dm
2014-07-29 16:45:55 +02:00
Chinsky
fcdca5ca5b
Merge pull request #5832 from Baystation12/master
...
master - > dev
2014-07-29 18:37:19 +04:00
Chinsky
8ccac61068
Merge pull request #5820 from Zuhayr/hydroponics
...
Bevy of newhydro fixes.
2014-07-29 17:59:28 +04:00
Chinsky
bf686a6401
Merge pull request #5815 from PsiOmegaDelta/Mecha
...
An Odysseus with patients now bypass mech movement-overrides.
2014-07-29 17:58:18 +04:00
PsiOmega
2f8bb7e135
Fixes runtime errors. AIs and cyborgs can now attach their photos to newscasters as well as photocopy them.
2014-07-29 15:45:22 +02:00
mwerezak
0345024f04
Removes telecomm and RD server temperature cap
2014-07-28 20:24:17 -04:00
mwerezak
e104647404
Sound fixes
2014-07-28 14:09:16 -04:00
Zuhayr
f8e50b28f5
Bevy of newhydro fixes.
2014-07-29 00:20:38 +09:30
Mloc
f7cfe55867
Merge pull request #5816 from Loganbacca/trainfix
...
More train fixes
2014-07-28 12:45:00 +01:00
Mloc
7b4382977b
Merge pull request #5813 from PsiOmegaDelta/Shuttle
...
Fixes #5810
2014-07-28 12:42:58 +01:00
Zuhayr
ad8ef7c4ab
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-28 20:59:29 +09:30
Loganbacca
5457cee527
More train fixes
...
- No passing plastic flaps
- Only human based mobs can board trains
- Adjacent checks for exiting vehicles
- Cleaned up as many direct loc moves as possible
- Places removed cells in the removers hand
2014-07-28 20:39:42 +12:00
PsiOmega
b935d7a0e0
An Odysseus with patients now bypass mech movement-overrides.
2014-07-28 10:25:29 +02:00
PsiOmega
537fa50728
Area naming consistency
...
Changes area name from "supply shuttle" to "Supply Shuttle" to match the casing of other areas.
2014-07-28 08:37:14 +02:00
Zuhayr
f61139f501
Merge pull request #5811 from DJSnapshot/hotfix
...
Massive bugfix/improvement to 3D sounds
2014-07-28 15:45:11 +09:30
