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
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
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
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
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
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
1150331bc4
Merge pull request #5828 from mwerezak/wound-infections
...
Fixes chest not being coloured by necrosis
2014-07-29 18:13:02 +04:00
Chinsky
4d8db295d8
Merge pull request #5814 from JimTheCactus/polaroid
...
Improves Polaroid Camera Images
2014-07-29 17:57:41 +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
Zuhayr
89be9e5f43
More adjustments. Implemented gas exuding/consumption (currently unused). Implemented cuttings, fixed some issues.
2014-07-29 13:24:52 +09:30
Zuhayr
7b084ed349
Fixed diona pods being mutable, fixed a few other tweaks, added cuttings.
2014-07-29 12:38:21 +09:30
mwerezak
9680cd85b7
Fixes chest not being coloured by necrosis
2014-07-28 20:51:04 -04:00
PsiOmega
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
JimTheCactus
f5df1acaaa
Added handler for pixel stepping
2014-07-28 13:05:29 -06:00
JimTheCactus
6b1f696203
Ported multi-turf behavior
...
This allows for layering that moves across tiles and enables alternate methods of enumerating the tile list (not used at present.)
2014-07-28 12:44:42 -06:00
JimTheCactus
f0594b6e21
Made camera render turf effects.
2014-07-28 12:10:21 -06:00
JimTheCactus
df3fcbc9b2
Ported nearest-neighbor scaling from TG
2014-07-28 11:54:01 -06:00
PsiOmega
63ab44accc
Makes it possible for the AI to take and view images.
2014-07-28 17:30:51 +02:00
Zuhayr
7f6b36e1dc
Fixes some transposed values.
2014-07-29 00:25:46 +09:30
Zuhayr
f8e50b28f5
Bevy of newhydro fixes.
2014-07-29 00:20:38 +09:30
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
JimTheCactus
8e4ac0a807
Modified to check every pixel
...
Checking only a few pixels had the tendancy to turn my charcter's head inside out when I was pointing directions other than south. Worse case is 1024 tests per object in the image. This test should be uncommon and the CPU usage is constrained by other factors.
2014-07-28 01:46:07 -06:00
JimTheCactus
bdbc404d07
Added workaround for non-directional icons with dir!=2
...
Several items in the map are set with a dir other than 2 but the icon associated with the item doesn't have directions. As such they misrender.
This resolves that specific issue, for the most part. Due to an odd behavior of Byond, when this circumstance occurs the icon proc produces a 32x32 image that is all alpha 0. At least that's what my testing suggests; it may be possible with large icons to encounter this as an issue and cause it to ignore an icon that should be reloaded from the default. However, this can't do any worse than the current software.
2014-07-28 01:04:52 -06:00
JimTheCactus
1d7310c49d
Patched display and dealt with lying.
2014-07-27 22:05:24 -06:00
Zuhayr
da42b20039
Merge pull request #5794 from Loganbacca/cups
...
Cup grammar fix
2014-07-28 10:11:57 +09:30
Zuhayr
11a2b0eb3c
Merge pull request #5792 from Whitellama/flavourtext
...
Dynamic Flavour Text
2014-07-28 10:11:02 +09:30
Loganbacca
4861c5a5d4
Grammar tweak
2014-07-28 07:38:24 +12:00
Mloc
d6caf74e56
Merge pull request #5769 from comma/dev
...
Enables logging of people beating monkey
2014-07-27 12:02:26 +01:00
Chinsky
ed5b05772f
Merge pull request #5777 from Loganbacca/trainfix
...
Cargo train fixes
2014-07-27 14:46:45 +04:00
Chinsky
c9d862b89a
Merge pull request #5783 from Walter0o/master
...
fixes nullpointer caused by broken organ list reading
2014-07-27 14:46:31 +04:00
Loganbacca
fbc9b03e73
Cup fix
...
- Grammar fix for drinking from cups
- Changed "Glass of Tomato juf" to "Glass of Tomato juice" (I'm assuming this was a typo)
2014-07-27 20:04:45 +12:00
Whitellama
0a0c18dbf6
Fixed issue with flavour text saving/loading from other characters
2014-07-26 18:50:34 -07:00
Chinsky
5fe8865f95
Merge pull request #5771 from JimTheCactus/name_fix
...
Added check for blank on name entry
2014-07-27 05:04:05 +04:00
Whitellama
eb64769734
Cleaned up mistake implementing dynamic flavour text
2014-07-26 17:41:03 -07:00
Whitellama
8f1417f14c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into flavourtext
2014-07-26 17:09:12 -07:00
Whitellama
0528675846
Added dynamic flavour text, where covered bodyparts' flavour isn't displayed
2014-07-26 17:08:55 -07:00
Whitellama
425dfd2a6e
Fixed issue with recognizing covered jumpsuit and gloves
2014-07-26 17:07:34 -07:00
Whitellama
bbc9150793
Updated body_parts_covered
2014-07-26 17:06:08 -07:00
JimTheCactus
0b7e858000
Changes check to an isnull rather than a truth test
...
This allows the client to detect the difference between a blank and someone pressing cancel.
2014-07-26 16:19:14 -06:00
