88c034a30b
Ports the "Family Man" Hair Pack from /vg/station.
2014-08-11 13:25:57 -07:00
c3de9ca3c7
Fixes #5946 and cuts down on duplicate code across Life() procs.
2014-08-11 10:42:32 +02:00
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
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
213b11601e
Updates emitters and containment field power usage
...
As well as PA power usage. It's not used at the moment, but it might be
used by downstream or in the future.
2014-08-10 00:40:58 -04:00
00fcfa7899
Makes it possible to setup pAI configuration from the character setup screen.
2014-08-08 13:31:52 +02:00
8568a6aa89
Explicit proc/Topic definitions.
2014-08-08 13:21:51 +02:00
ec3262a2a9
Merge pull request #5894 from atlantiscze/cyborg_module_icons
...
Cyborg component icons!
2014-08-04 19:38:57 -05:00
a4fc1bfd6a
Merge pull request #5886 from mwerezak/stun-baton
...
Fixes some handcuff oversights
2014-08-04 15:15:52 -05:00
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
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
f510c05865
Merge pull request #5862 from mwerezak/stun-baton
...
Stun Baton Nerf
2014-08-03 12:59:54 +09:30
67799a5324
Merge pull request #5871 from PsiOmegaDelta/PhotoAI
...
Fixes runtime error when borgs attempt to sync photos with master AI
2014-08-03 12:58:15 +09:30
2619fb61ce
Merge pull request #5872 from PsiOmegaDelta/Manifest
...
Fixes #5867
2014-08-03 12:57:19 +09:30
e2ea86eab1
Merge pull request #5699 from Zuhayr/calamity
...
Calamity mode.
2014-08-02 11:39:29 +01:00
91d503e209
Removes duplicate code from human/bullet_act
...
Also moves stun projectile handling up to living/bullet_act, as all the
human specific code has been moved to other procs
2014-08-01 23:57:18 -04:00
0868c344cc
Adjustments and a typo fix.
2014-08-01 23:50:33 +09:30
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
c416205c7d
Moves robot/drone specific New()-code into their respective classes, handling it using proc-overloads.
...
Also re-arranges robot init() code to prevent a runtime error when attempting to synch photos with the Master AI.
2014-08-01 09:17:26 +02:00
63aab94d3c
Cleans up weapon embedding code
...
Removed weapon embedding from human/apply_damage(), as it didn't really
belong there. As well, used_weapon is intended mainly for autopsy info,
so it didn't seem appropriate to use it to embed things.
2014-07-31 19:43:36 -04:00
768019b918
Stunbaton fixes and cleanup
...
Apparently harm intent is "hurt", not "harm"
2014-07-31 19:17:05 -04:00
71e54111ab
Handcuffs now require an aggressive grab
2014-07-31 18:10:11 -04:00
8bd7a11ff4
Fixes siemens coefficient not blocking stun disarm
2014-07-31 17:19:35 -04:00
697979c2f6
Makes humans scream if taking enough halloss
2014-07-31 17:06:42 -04:00
5b90e4afc6
Allows the use of stun weapons to show up in autopsies
2014-07-31 17:01:06 -04:00
ecd7df9628
Adds disarm effect for stun weapons and hands
2014-07-31 16:52:50 -04:00
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
c8cccb64f6
Adds siemens_coefficient handling to stun batons
2014-07-31 15:38:56 -04:00
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
a644156bdf
Taser cleanup and fixes
...
Fixes cloaking devices and deadman switches being included in taser code
somehow.
2014-07-31 13:40:23 -04:00
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
70fe00e1c1
Updated borer icons slightly.
2014-07-30 21:51:17 +09:30
dac4e3432e
Adjusted borer spawns/options/vars.
2014-07-30 21:08:54 +09:30
3ad8f4ca24
Merge branch 'dev' into Pics
...
Conflicts:
code/modules/paperwork/photography.dm
2014-07-29 16:45:55 +02:00
fcdca5ca5b
Merge pull request #5832 from Baystation12/master
...
master - > dev
2014-07-29 18:37:19 +04:00
1150331bc4
Merge pull request #5828 from mwerezak/wound-infections
...
Fixes chest not being coloured by necrosis
2014-07-29 18:13:02 +04:00
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
9680cd85b7
Fixes chest not being coloured by necrosis
2014-07-28 20:51:04 -04:00
a5f6d417a1
Expands the AI photo-camera so that it now has robot/cyborg support. Also implements DRY in practice.
2014-07-28 23:41:55 +02:00
63ab44accc
Makes it possible for the AI to take and view images.
2014-07-28 17:30:51 +02:00
11a2b0eb3c
Merge pull request #5792 from Whitellama/flavourtext
...
Dynamic Flavour Text
2014-07-28 10:11:02 +09:30
d6caf74e56
Merge pull request #5769 from comma/dev
...
Enables logging of people beating monkey
2014-07-27 12:02:26 +01:00
eb64769734
Cleaned up mistake implementing dynamic flavour text
2014-07-26 17:41:03 -07:00
8f1417f14c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into flavourtext
2014-07-26 17:09:12 -07:00
0528675846
Added dynamic flavour text, where covered bodyparts' flavour isn't displayed
2014-07-26 17:08:55 -07:00
bbc9150793
Updated body_parts_covered
2014-07-26 17:06:08 -07:00
e5eb9cc496
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hydroponics
2014-07-27 03:24:27 +09:30
4ef8a08310
Added portable_atmospherics to hydroponics machine path, couple of other tweaks.
2014-07-27 03:20:16 +09:30
c34cf89a04
Merge pull request #5784 from Jarcolr/patch-3
...
Fixes #5691
2014-07-26 17:18:38 +04:00
9e233f1597
Fixes #5691
...
Chef >> Chefhat
2014-07-26 13:41:43 +03:00
iamgoofball