GinjaNinja32
84c7625490
Chemical logging improvements
2015-07-29 07:55:30 +01:00
mwerezak
6df770cab3
Fixes projectiles being able to hit humans in organs they do not have.
...
Will also prevent body shields blocking bullets with non-existant limbs. Expands on the special return values for bullet_act(), adds defines for them.
2015-07-28 20:23:26 -04:00
mwerezak
d203362d38
Fixes #10258
...
Turrets now aim at the chest/groin unless the target has a neck grab on someone, otherwise they aim elsewhere.
Projectiles are now able to miss targets that are lying or buckled, except when the target is at point blank range and is the original target for the projectile.
2015-07-28 20:17:32 -04:00
PsiOmega
9c4a0a91c0
Fixes crew monitor runtime and removes dead code.
...
The crew monitor used src instead of nano_host(). Also removes unneeded Topic() href.
2015-07-28 21:33:14 +02:00
GinjaNinja32
74f04671f8
His book? Her book.
2015-07-28 13:37:15 +01:00
Chinsky
0a54797044
Merge pull request #10341 from GinjaNinja32/notes-format
...
Changes show_player_info_irc to properly escape '%'
2015-07-28 14:02:08 +03:00
GinjaNinja32
09a8f37d6c
Changes show_player_info_irc to properly escape '%'
2015-07-28 10:59:51 +01:00
PsiOmegaDelta
2387b88507
Compilation fixes.
2015-07-28 09:06:08 +02:00
PsiOmegaDelta
0ab507ccec
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-07-28 09:03:49 +02:00
PsiOmegaDelta
0bf3c39095
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-07-28 07:59:49 +02:00
Mloc
aab326e05f
fixes #10232
...
makes lights trigger on forceMove using a vg change
Signed-off-by: Mloc <colmohici@gmail.com >
2015-07-27 11:40:37 +01:00
GinjaNinja32
40693fda5b
Merge pull request #10335 from PsiOmegaDelta/150727-SpawnLog
...
Adds admin message log to the spawn verb.
2015-07-27 10:54:40 +01:00
Mloc
1d8e015334
fixes #10141
...
also clean up alloy_data handling
Signed-off-by: Mloc <colmohici@gmail.com >
2015-07-27 10:49:51 +01:00
PsiOmegaDelta
81c40c14b1
Compacts down the game panel spawn logging and makes it always notify admins.
2015-07-27 11:47:55 +02:00
PsiOmegaDelta
631c30732d
Adds admin message log to the spawn verb.
...
The spawn-verb no longer only makes an entry in the admin log but also messages admins, making it less sneaky.
2015-07-27 11:24:44 +02:00
Mloc
65ad30f27c
Merge pull request #10305 from GinjaNinja32/player-panel
...
Changes player panel to always display key if present
2015-07-27 10:20:11 +01:00
PsiOmegaDelta
ff2b3865b8
Compilation fixes.
2015-07-27 10:41:21 +02:00
Zuhayr
c5c7dddf63
Merge pull request #9979 from mwerezak/camera-console-fix
...
More check_eye() fixes
2015-07-27 17:56:03 +09:30
PsiOmegaDelta
5cbb703609
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/unsorted.dm
code/game/jobs/access.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/update_icons.dm
code/modules/organs/organ.dm
code/modules/reagents/Chemistry-Holder.dm
code/setup.dm
2015-07-27 10:20:20 +02:00
PsiOmegaDelta
0838de3ba2
Compilation fixes.
2015-07-27 10:03:31 +02:00
PsiOmegaDelta
c159f4657a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/inventory.dm
2015-07-27 09:53:08 +02:00
PsiOmegaDelta
c44f5916df
Merge pull request #10323 from mwerezak/accessory-fix
...
Fixes #9326
2015-07-27 09:36:02 +02:00
Zuhayr
e0429af2f7
Added config option for initial brain organ health.
2015-07-27 15:33:54 +09:30
Zuhayr
4afa8a80f8
Readds config option to disable organ decay.
2015-07-27 15:30:38 +09:30
Kearel
f4aa2376c8
Initial fixes
...
Changes interaction between stumps and items.
2015-07-26 22:13:46 -05:00
Zuhayr
64ccd8a048
Merge pull request #10269 from Mloc/lightwrite
...
lighting work
2015-07-27 11:41:14 +09:30
mwerezak
7157cc1748
Fixes #9326
2015-07-26 14:57:49 -04:00
GinjaNinja32
0e71efea18
Changes player planel to always display key if present
2015-07-26 11:03:36 +01:00
PsiOmega
984d5ee337
More #10285 fixes.
...
This one is dev-freeze only. Adds another sanity check to trans_to_holder to avoid runtime issues.
2015-07-26 10:46:58 +02:00
PsiOmega
bd6ec4a98e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/atoms.dm
code/game/machinery/rechargestation.dm
2015-07-26 10:21:36 +02:00
PsiOmega
659b07415d
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/machinery/rechargestation.dm
code/game/mecha/equipment/tools/medical_tools.dm
maps/exodus-1.dmm
2015-07-26 10:00:12 +02:00
GinjaNinja32
167b1183ef
Fixes 'Fixes sealed rig removal exploit'
2015-07-26 05:47:04 +01:00
PsiOmega
3c1a3f6951
Fixes #10285 .
...
Adds Topic() input sanity checking.
2015-07-25 14:18:10 +02:00
PsiOmega
835d4ddcde
Fixes #10267 .
...
Laws are always pre-sanitized.
2015-07-25 13:30:25 +02:00
Snapshot
a13467d8a4
Merge pull request #10286 from comma/tor
...
Updates ToR list URL
2015-07-24 17:31:15 -07:00
Chinsky
0753429740
Updates ToR list URL
2015-07-25 03:27:46 +03:00
PsiOmegaDelta
74872e28a7
Compilation fix.
2015-07-24 11:02:39 +02:00
PsiOmegaDelta
f3c9a7224b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/storage/storage.dm
code/modules/reagents/reagent_containers/borghydro.dm
2015-07-24 10:53:57 +02:00
Chinsky
90ae24dd1c
Merge pull request #10135 from Kelenius/ofBorgsAndShakers
...
Of borgs and shakers
2015-07-23 21:41:48 +03:00
PsiOmegaDelta
39a1b3e4ab
Merge pull request #10272 from Baystation12/dev-freeze
...
Dev freeze -> Dev
2015-07-23 08:14:39 +02:00
Mloc
26a4e12cd2
make lighting falloff a macro and optimize turfs-in-view
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-07-22 16:22:28 +01:00
Mloc
65ac3d97d0
Revert "get rid of mob.see_in_dark and species.darksight"
...
This reverts commit 278a4c38ec
2015-07-22 15:14:40 +01:00
Mloc
30f448cdd2
Merge pull request #10253 from PJB3005/bay-lights
...
Lighting: The sanicking
2015-07-22 14:55:49 +01:00
Zuhayr
3579ab8373
Merge pull request #10259 from mwerezak/rig-module-fix
...
Fixes #10151
2015-07-22 10:45:21 +09:30
mwerezak
c7488c712b
Fixes #10151
2015-07-21 20:34:39 -04:00
PJB3005
b6a1ee2adf
Lighting: The sanicing
2015-07-21 15:58:39 +02:00
PsiOmegaDelta
d276d4b8f0
Merge pull request #10252 from Baystation12/dev-freeze
...
Dev freeze -> Dev
2015-07-21 14:42:16 +02:00
PsiOmegaDelta
9aa79bc6f1
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-07-21 14:25:46 +02:00
PsiOmegaDelta
617db485ee
qdel/Destroy entries.
2015-07-21 14:22:01 +02:00
PsiOmegaDelta
1c7b860783
Spells are now restored when cloning.
2015-07-21 11:34:26 +02:00
