Zuhayr
f510c05865
Merge pull request #5862 from mwerezak/stun-baton
...
Stun Baton Nerf
2014-08-03 12:59:54 +09:30
Zuhayr
75ff627046
Merge pull request #5868 from JimTheCactus/getFlatIcon_runtime
...
Fixes getFlatIcon Runtime on Atoms with no Icon
2014-08-03 12:59:14 +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
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
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
mwerezak
d034511ee6
Updates gas filter
2014-08-01 22:59:13 -04:00
mwerezak
f0016df4f3
Adds gas filtering proc
2014-08-01 20:37:48 -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
mwerezak
400c1b5cf6
Fixes mistake in scrubbing calculation
2014-08-01 19:33:57 -04: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
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
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
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
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
48b3775e65
Merge pull request #5837 from atlantiscze/dronechat-fix
...
Fixes #5827
2014-08-01 21:57:49 +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
JimTheCactus
e02cfbec8c
Tidy up and use more sane defaults.
2014-07-31 22:17:26 -06:00
JimTheCactus
718b94fa3a
Modified function such that the atom isn't used in the defaults.
...
This caused the routine to crash when the atom didn't have an icon or was null.
2014-07-31 21:46:00 -06: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
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
mwerezak
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
