f04ca77bfb
revert chargen rendering rework
...
fixes #9733
Signed-off-by: Mloc <colmohici@gmail.com >
2015-08-01 11:35:53 +01:00
47d30a49a0
Fixes #10389
...
Allows glasses to set the see_invisible of their wearer.
2015-07-31 01:33:43 -04:00
ac5774c81c
some dview tweaks & fixes
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-07-30 19:50:32 +01:00
ad63247749
Merge pull request #10382 from Mloc/freezyfixes
...
fixes
2015-07-31 03:55:34 +09:30
8cf9e32c2e
Merge pull request #10361 from atlantiscze/tiny-little-logspammers
...
Fixes #10356
2015-07-30 19:24:24 +01:00
6ef93d6613
Merge pull request #10370 from mwerezak/wounds
...
Fixes wound max_bleeding_stage oddness
2015-07-30 19:24:13 +01:00
ce11a6b516
Merge pull request #10379 from Karolis2011/dev-freeze
...
Fix for invisible tagger pipes
2015-07-30 19:23:33 +01:00
c29dd9063c
More tweaks to cut wound stages.
...
Enforced "blood soaked" clots where the clot stage was also a bleeding
stage, adjusted the thresholds for gaping_big and massive wounds to be
more even.
2015-07-30 11:46:49 -04:00
a38ac6c8b7
Fix for invisible tagger pipes
2015-07-30 12:37:10 +03:00
841f7f6db2
Compilation fixes.
2015-07-30 10:41:01 +02:00
b6bd51828a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/robot/robot_upgrades.dm
code/modules/admin/admin_verbs.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Recipes.dm
code/modules/reagents/reagent_containers/syringes.dm
2015-07-30 10:38:44 +02:00
10df6b9403
Fixes #10363
2015-07-30 00:57:31 -04:00
171991faf8
Attempts to prevent future max_bleeding_stage confusion
...
max_bleeding_stage no longer switches itself around in New().
Instead, the value given refers directly to the index of the maximum
bleeding stage.
Should also make wound datums more friendly to initial(), if that's ever
needed.
2015-07-29 16:53:31 -04:00
3d10955ccb
Adds missing clot stages to gaping_big and massive cuts.
...
Without the clot stages the jump between the next two stages was
abnormally large, and the values given for max_bleeding_stage did not make
much sense.
2015-07-29 16:46:50 -04:00
d384150a48
Fixes wound max_bleeding_stage oddness
...
The max_bleeding_stage given to /datum/wound/cut/flesh led to
"Doctor places a bandaid on Patient's flesh wound." Also fixed the
bleeding stage for stumps, so that "bloody stump" counts as a bleeding
stage.
2015-07-29 16:40:09 -04:00
55e41b9afd
Fixes #10356
...
- Maintenance drone law reset no longer spam admin's logs.
2015-07-29 20:19:31 +02:00
b9d8cdaee1
Merge pull request #10337 from mwerezak/turret-aiming
...
Fixes #10258
2015-07-29 16:18:42 +03:00
2b13741582
Merge pull request #10348 from GinjaNinja32/logs
...
Chemical logging improvements
2015-07-29 13:39:26 +01:00
e17b8be47e
Merge pull request #10344 from GinjaNinja32/cult-gender
...
His book? Her book.
2015-07-29 14:37:16 +03:00
7a6599fdf4
Add logging to potassium-water and nitroglycerin reactions
2015-07-29 12:36:00 +01:00
0e8ca3c82c
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/admin/player_notes.dm
2015-07-29 11:57:17 +02:00
84c7625490
Chemical logging improvements
2015-07-29 07:55:30 +01:00
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
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
74f04671f8
His book? Her book.
2015-07-28 13:37:15 +01:00
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
09a8f37d6c
Changes show_player_info_irc to properly escape '%'
2015-07-28 10:59:51 +01:00
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
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
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
1d8e015334
fixes #10141
...
also clean up alloy_data handling
Signed-off-by: Mloc <colmohici@gmail.com >
2015-07-27 10:49:51 +01:00
81c40c14b1
Compacts down the game panel spawn logging and makes it always notify admins.
2015-07-27 11:47:55 +02:00
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
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
c5c7dddf63
Merge pull request #9979 from mwerezak/camera-console-fix
...
More check_eye() fixes
2015-07-27 17:56:03 +09:30
0838de3ba2
Compilation fixes.
2015-07-27 10:03:31 +02:00
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
c44f5916df
Merge pull request #10323 from mwerezak/accessory-fix
...
Fixes #9326
2015-07-27 09:36:02 +02:00
e0429af2f7
Added config option for initial brain organ health.
2015-07-27 15:33:54 +09:30
4afa8a80f8
Readds config option to disable organ decay.
2015-07-27 15:30:38 +09:30
64ccd8a048
Merge pull request #10269 from Mloc/lightwrite
...
lighting work
2015-07-27 11:41:14 +09:30
7157cc1748
Fixes #9326
2015-07-26 14:57:49 -04:00
0e71efea18
Changes player planel to always display key if present
2015-07-26 11:03:36 +01:00
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
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
167b1183ef
Fixes 'Fixes sealed rig removal exploit'
2015-07-26 05:47:04 +01:00
3c1a3f6951
Fixes #10285 .
...
Adds Topic() input sanity checking.
2015-07-25 14:18:10 +02:00
835d4ddcde
Fixes #10267 .
...
Laws are always pre-sanitized.
2015-07-25 13:30:25 +02:00
a13467d8a4
Merge pull request #10286 from comma/tor
...
Updates ToR list URL
2015-07-24 17:31:15 -07:00
0753429740
Updates ToR list URL
2015-07-25 03:27:46 +03:00
Mloc