55e41b9afd
Fixes #10356
...
- Maintenance drone law reset no longer spam admin's logs.
2015-07-29 20:19:31 +02:00
b80dad0329
Fixes #10355
...
- Bots can now be unlocked when you have one of the required accesses, instead of requiring all of them.
- In other words, security officers can once again unlock beepsky. I believe no other bot uses more than one access level for unlocking.
2015-07-29 19:58:01 +02:00
b9d8cdaee1
Merge pull request #10337 from mwerezak/turret-aiming
...
Fixes #10258
2015-07-29 16:18:42 +03:00
b362be9bb1
Russian roulette
...
Fun for whole sec team!
2015-07-29 16:15:24 +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
e037ee3fca
Merge pull request #10345 from PsiOmegaDelta/150728-CrewMonitorRuntime
...
Fixes crew monitor runtime and removes dead code.
2015-07-29 14:25:43 +03:00
f49d8d5e54
Merge pull request #10352 from Baystation12/dev-freeze
...
Dev freeze
2015-07-29 12:16:23 +02: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
f948932bee
Updates sleepers
...
WIP
2015-07-29 11:17:15 +03:00
8152ce0676
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/29/2015_bay_sync
...
Conflicts:
polaris.dme
2015-07-29 03:45:53 -04: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
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
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
9e46dfbb56
Re-arranges data record and crew arrival announcement code.
2015-07-28 11:27:44 +02:00
e1aa05be02
Merge remote-tracking branch 'upstream/dev' into 150707-MoreOverlaysFewerStates
...
Conflicts:
code/game/machinery/computer/security.dm
2015-07-28 09:16:34 +02:00
2387b88507
Compilation fixes.
2015-07-28 09:06:08 +02:00
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
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
47f0b47c46
Borosilicate windows
...
- This is the second part of my PR that added phoron windows to protect the SM core from fires
- Borosilicate windows are heat resistant versions of regular glass windows. This PR renames them (from phoron windows/phoron glass/etc.) and adjusts the fire resistances
- They are no longer completely fireproof. Instead, all window types have fire resistance variables - maximal safe temperature and amount of damage taken if temperature exceeds this limit.
- Regular: 100C, Regular Reinforced: 750C, Borosilicate: 2000C, Borosilicate Reinforced: 4000C.
- Adds alloying recipe to make borosilicate glass. 2 sand + 1 platinum alloy.
2015-07-27 13:49:12 +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
ff2b3865b8
Compilation fixes.
2015-07-27 10:41:21 +02:00
c5c7dddf63
Merge pull request #9979 from mwerezak/camera-console-fix
...
More check_eye() fixes
2015-07-27 17:56:03 +09:30
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
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
0ba7643217
Updates files as necessary to adhere to the new standard.
2015-07-27 09:32:51 +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
f445d6d126
Moves the energy chemical dispenser and cartridge chemical dispenser under one common object. Fixes the map due to type path changes.
2015-07-26 23:20:42 -04:00
f4aa2376c8
Initial fixes
...
Changes interaction between stumps and items.
2015-07-26 22:13:46 -05:00
7a22829ee9
Revert "Replaces gaseous reagents with organic chemistry ones."
...
This reverts commit aa22f7307a
2015-07-26 22:43:40 -04:00
64ccd8a048
Merge pull request #10269 from Mloc/lightwrite
...
lighting work
2015-07-27 11:41:14 +09:30
045c7323a0
Begins work on removing the chemistry changed introduced from bay.
2015-07-26 22:01:35 -04:00
ecaf43440b
Paperbin
...
Adds ability to pick up paperbin by dragging it on the player.
2015-07-26 18:58:29 -05:00
94a2ec5bf1
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2
...
Conflicts:
.travis.yml
polaris.dme
2015-07-26 16:01:27 -04:00
7c6cd7b1e7
Further modifications
2015-07-26 13:58:53 -05:00
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
Atlantis