Commit Graph

11870 Commits

Author SHA1 Message Date
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
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
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
Zuhayr
c5c7dddf63 Merge pull request #9979 from mwerezak/camera-console-fix
More check_eye() fixes
2015-07-27 17:56:03 +09:30
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
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
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
Chinsky
90ae24dd1c Merge pull request #10135 from Kelenius/ofBorgsAndShakers
Of borgs and shakers
2015-07-23 21:41:48 +03: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
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
PsiOmegaDelta
616b4b60e4 Magical fixes.
The wizard den is no longer pitch black.
Fixes targeted spells using the wrong caster/source.
Adds some missing checks using the caster source above.
Re-logging should no longer cause a loss of spell UI icons.
Mind transfer should no longer cause unintended spell loss.
2015-07-21 11:34:25 +02:00
Kelenius
83cc80b341 Fixes #9719 - dead goats retaliate
Goats now only produce a message if they are alive
2015-07-20 17:01:29 +03:00
PsiOmegaDelta
d1ae6b275c Fixes #10244.
Adds a return statement.
2015-07-20 09:14:06 +02:00
Kelenius
b6beb8c299 Admin logs for borg hypo 2015-07-20 09:31:02 +03:00
PsiOmegaDelta
ed2a49ba3e Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/stacks/medical.dm
2015-07-20 08:20:40 +02:00
PsiOmegaDelta
c2010bd612 Merge pull request #10236 from mwerezak/robot-custom-icon
Fixes #10215
2015-07-19 12:56:00 +02:00
PsiOmegaDelta
8703bcb72d Merge pull request #10238 from mwerezak/sleepygas
Fixes #9868
2015-07-19 12:55:25 +02:00
Zuhayr
a45d26079f Merge pull request #10239 from mwerezak/lighting-fix
Fixes #10210
2015-07-19 20:13:55 +09:30
PsiOmegaDelta
cac095e53a Merge pull request #10237 from mwerezak/throw-mode
Fixes #10230
2015-07-19 10:55:56 +02:00
mwerezak
ac2dd5f3ca Fixes #10210 2015-07-19 00:25:09 -04:00
mwerezak
4ea1379b33 Fixes #10230
Moves throw mode procs up to /mob level, clicking on a non-turf or an
atom that is not in a turf cancels throw mode.
2015-07-18 23:27:09 -04:00