Ccomp5950
52da372bac
Fueltanks now log and admin_msg when shot at / weldered
2014-08-04 21:11:09 -05:00
Ccomp5950
ec3262a2a9
Merge pull request #5894 from atlantiscze/cyborg_module_icons
...
Cyborg component icons!
2014-08-04 19:38:57 -05:00
Zuhayr
33ef081191
Merge pull request #5895 from mwerezak/fixes
...
Fixes
2014-08-05 08:23:38 +09:30
Walter0o
dcc3393b25
fixes #5876
...
stun beams killed simple animals
2014-08-04 23:41:23 +02:00
Ccomp5950
a4fc1bfd6a
Merge pull request #5886 from mwerezak/stun-baton
...
Fixes some handcuff oversights
2014-08-04 15:15:52 -05:00
Ccomp5950
c3e5cb8eb7
Merge pull request #5885 from Walter0o/lipstick_fix
...
lipstick wiping fix
2014-08-04 15:14:42 -05:00
mwerezak
6a7c9e46e6
Fixes #5881
2014-08-04 13:04:34 -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
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
2dd71b53a7
adds lipstick wiping to proper paper/attack()
2014-08-03 13:52:59 +02:00
Loganbacca
b8f31c0b0a
Train fixes and balancing
...
- Slows trains to 90% of running speed
- Changes train impact damage to only take into account speed, not train length (otherwise you could insta kill people with a long enough train)
- Fixes a bug with towed cars ghosting through closed airlocks
- Stuns mobs who fall off a train that has blown up
- Fixes mobs standing/lying on vehicles
- Fixes exploding trains not decoupling correctly
2014-08-03 20:45:41 +12:00
mwerezak
cb2f68f81e
Merge remote-tracking branch 'upstream/dev' into power-net
2014-08-03 01:50:51 -04:00
Loganbacca
b57a814fb2
Reversing fix
...
- Allows cargo tugs to reverse their direction if they are not towing anything
2014-08-03 16:42:14 +12:00
Loganbacca
500fc11db9
Verb fix
...
- Handles verb changes in the turn_off() and turn_on() procs
2014-08-03 16:36:24 +12: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
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
Zuhayr
2619fb61ce
Merge pull request #5872 from PsiOmegaDelta/Manifest
...
Fixes #5867
2014-08-03 12:57:19 +09:30
Zuhayr
ab54e7e2d6
Merge pull request #5878 from Walter0o/aliums
...
fixes alien castes not understanding each other
2014-08-03 12:56:47 +09:30
Zuhayr
c6b40dbc1a
Merge pull request #5877 from Walter0o/dna_fix
...
fixes runtime with calling PP on dna-less mobs
2014-08-03 12:56:22 +09:30
Mloc
e2ea86eab1
Merge pull request #5699 from Zuhayr/calamity
...
Calamity mode.
2014-08-02 11:39:29 +01:00
mwerezak
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
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
Whitellama
dad248d49d
Fixed #5870 : Glasses being labeled both 'glass' and 'Drinking glass' inconsistently
2014-08-01 16:39:19 -07:00
Walter0o
5895a098fe
fixes alien castes not understanding each other
...
only /mob/living/carbon/alien have this var set, so this will not touch anything else.
2014-08-01 22:34:28 +02:00
Walter0o
f21ac59588
fixes runtime with calling PP on dna-less mobs
2014-08-01 21:59:48 +02:00
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
e298b177db
Added flags for Mining and Xenoarch.
2014-08-01 22:40:48 +09:30
Zuhayr
1bd8b7baf0
Added citizenship, faction, religion and home system to character generation.
2014-08-01 22:05:38 +09:30
Zuhayr
a6e483d48d
Merge pull request #5856 from PsiOmegaDelta/SuperMatter
...
Fixes #5844
2014-08-01 22:00:19 +09:30
Zuhayr
9c1e14eb67
Merge pull request #5855 from PsiOmegaDelta/PurpleComb
...
Fixes #5839
2014-08-01 21:59:41 +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
128ad5a817
Merge pull request #5843 from mwerezak/taj-suits
...
Updates tajaran hardsuit sprites
2014-08-01 21:58:11 +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
Zuhayr
1376a827d6
Merge pull request #5833 from Jarcolr/customs
...
Adds *6* approved custom items and updates a custom item
2014-08-01 21:57:33 +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
PsiOmega
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
mwerezak
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
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
8bd7a11ff4
Fixes siemens coefficient not blocking stun disarm
2014-07-31 17:19:35 -04:00
mwerezak
697979c2f6
Makes humans scream if taking enough halloss
2014-07-31 17:06:42 -04:00
mwerezak
5b90e4afc6
Allows the use of stun weapons to show up in autopsies
2014-07-31 17:01:06 -04:00
mwerezak
ecd7df9628
Adds disarm effect for stun weapons and hands
2014-07-31 16:52:50 -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
