PsiOmega
2a46b83dce
Adds new items. Source: https://github.com/Baystation12/Baystation12/pull/5928
2014-08-13 09:35:04 +02:00
Chinsky
7befe12950
Merge pull request #5965 from Lancer411/dev
...
Fixes for grid_check random event.
2014-08-12 21:55:38 +04:00
Zuhayr
3d16309444
Merge pull request #5956 from comma/optable
...
Optable changes
2014-08-13 00:46:21 +09:30
Lancer411
80305bc2fb
Checks for SMES Z level at power_failure.dm
...
Little fix which checks Z level of SMES before drying it up at grid_check event.
2014-08-12 22:05:28 +08:00
Lancer411
784b546e93
Fixes for grid_check random event.
...
There was an issue, when APC with removed cell in area was powered at power_restore() proc, making area allways powered despite APC was not working.
Removed part of code which unpowers area directly, bypassing the APC process code. This makes grid_check event less laggy and smooth. Downside is lights not being shut down immediatly.
AI SMES still not being affected after this fix.
2014-08-12 19:50:20 +08:00
Chinsky
37ad0e3c1c
Changed optable so it would not care why victim is lying down. It would only accept victim if it was resting, so sometimes it would not recognize lying mobs as valid victims, leading to lots of unfun in surgery.
...
Updated surgery helper to account for that, also cleaned it up a little with replacing all the possible causes of lying down with just lying check. It's all checked in can_move already.
2014-08-11 19:07:19 +04:00
Zuhayr
a2945a00d7
Merge pull request #5940 from mwerezak/power-net
...
Update for shield generator power use and power net fixes
2014-08-11 10:13:26 +09:30
mwerezak
03e557823c
Fixed #5912
...
Also fixes hydroponics trays not updating
2014-08-10 16:29:09 -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
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
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
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
Ccomp5950
ec3262a2a9
Merge pull request #5894 from atlantiscze/cyborg_module_icons
...
Cyborg component icons!
2014-08-04 19:38:57 -05:00
Ccomp5950
a4fc1bfd6a
Merge pull request #5886 from mwerezak/stun-baton
...
Fixes some handcuff oversights
2014-08-04 15:15:52 -05: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
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
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
