PsiOmegaDelta
00953968dd
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-06-04 08:20:00 +02:00
PsiOmegaDelta
6c903907c0
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-06-04 08:10:49 +02:00
PsiOmegaDelta
bb1dbe9f67
Merge pull request #9656 from Techhead0/requestConsole
...
Request Console cleanup.
2015-06-04 08:01:13 +02:00
Techhead0
0195c179ff
Request Console cleanup.
...
Changes screen and departmentType to use defines and bitflags instead of magic numbers.
Moves code from the message sender to send_rc_message().
One console's destruction no longer prevents the entire department from receiving messages.
2015-06-03 22:38:04 -04:00
PsiOmega
086517f988
Closes a span class.
...
Has somehow gone unnoticed until now.
2015-06-03 17:57:57 +02:00
Zuhayr
9d9efc336b
Merge pull request #9649 from mwerezak/fixes
...
Fixes
2015-06-03 11:45:45 +09:30
mwerezak
0777f9c998
Fixes #9648
...
Robotic limbs are no longer able to mutate.
2015-06-02 21:40:30 -04:00
GinjaNinja32
3434826eaf
Merge pull request #9490 from Zuhayr/xenoruins
...
Random map generator expansion.
2015-06-02 20:59:52 +01:00
Chinsky
807a92f6d7
Merge pull request #9647 from GinjaNinja32/eftpos
...
Fixes #9645
2015-06-02 22:42:48 +03:00
GinjaNinja32
5a2933bb4f
Fixes #9645
2015-06-02 20:39:03 +01:00
Chinsky
58d9cb24a2
Merge pull request #9632 from PsiOmegaDelta/150602-Access
...
Generalizes access definitions.
2015-06-02 22:32:11 +03:00
Zuhayr
ebe62cefd8
Refactored random map generator system and added several terrain generators.
...
Created a global list to track base turfs for explosions/shuttle moves.
Remaps the asteroid to be a moonlet. Tidies up some references to 'asteroid', removes moonbase from the accessible z level list.
2015-06-03 04:36:19 +09:30
Zuhayr
04d1b40e3d
Merge pull request #9626 from GinjaNinja32/vine_event_fix
...
Fixes vine/infestation events not working with new lighting
2015-06-03 04:00:21 +09:30
Zuhayr
49e121bb7a
Merge pull request #9630 from PsiOmegaDelta/150602-EventTweak
...
Active role counting tweak.
2015-06-03 04:00:17 +09:30
Zuhayr
da3ee37df9
Merge pull request #9638 from PsiOmegaDelta/150602-LawSets
...
Allows all synths to view the alternative law sets.
2015-06-03 04:00:11 +09:30
PsiOmegaDelta
3988d6ac90
Merge pull request #9388 from Techhead0/prisonBreak2.0
...
Refactors and expands the Prison Break event.
2015-06-02 18:58:20 +02:00
PsiOmegaDelta
88b80732e7
Generalizes access definitions.
...
Access description, type, and area/region (medical, security, etc.) is now defined in a datum, ensuring the id modification consoles will (should) never be missing entries.
2015-06-02 18:11:46 +02:00
GinjaNinja32
24adb8eb42
Fixes vine/infestation events not working with new lighting
...
Also adds a helper for finding whether there are any simulated atoms on a turf
2015-06-02 16:56:10 +01:00
Mloc
c1ce2f02b7
reorganize xgm into its own module
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-06-02 16:29:23 +01:00
Chinsky
886462c100
Merge pull request #9637 from PsiOmegaDelta/150602-LessRightClicking-Master
...
Reduction of admin right-click verbs.
2015-06-02 16:53:56 +03:00
PsiOmegaDelta
1a74b536d7
Active role counting tweak.
...
The number of Any players now properly respects activity.
Borgs should now properly increase the number of players for a given job.
2015-06-02 15:46:01 +02:00
GinjaNinja32
9ecde8f2a7
Merge pull request #9633 from comma/dev-freeze
...
Couple fixes
2015-06-02 14:37:07 +01:00
PsiOmegaDelta
3f26eeac99
Allows all synths to view the alternative law sets.
...
This does not include laws such as the syndicate, spider clan, etc. laws.
Makes it less of a headache for a synth to state the standard NT laws while subverted, etc.
2015-06-02 14:48:08 +02:00
PsiOmegaDelta
fcb0841646
Reduction of admin right-click verbs.
...
Removes verbs which only works on specific mob types from the admin right-click context.
Fixes #9627 .
Fixes #9628 .
2015-06-02 14:20:14 +02:00
PsiOmegaDelta
4a69d0a4f7
More MayRespawn checks.
...
Astral projecting wizards/cultists may no longer respawn as something else.
2015-06-02 13:40:53 +02:00
PsiOmegaDelta
2c8c9df9d2
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
html/changelogs/.all_changelog.yml
2015-06-02 13:35:02 +02:00
PsiOmegaDelta
4a976e1ee2
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-06-02 13:13:40 +02:00
Chinsky
28c8cd1d81
Fixes #9623
...
Also added a nullcheck for icons to prevent potential client crash.
2015-06-02 13:13:44 +03:00
Zuhayr
717b191fe2
Minor refactor to reduce calls to handle_actions().
2015-06-02 18:30:13 +09:30
Zuhayr
dadc434f4e
Ported action button system from Paradise/tg
2015-06-02 17:17:13 +09:30
PsiOmegaDelta
e70faa20ee
Merge pull request #9629 from GinjaNinja32/spawn
...
Spawn fixes
2015-06-02 08:05:54 +02:00
GinjaNinja32
5ebece6368
Spawn fixes
...
Fixes spawning a chem dispenser spamming the log with label settings
Fixes Spawn-Fruit and Spawn-Plant not being usable from hotbar
Fixes Spawn-Fruit and Spawn-Plant not producing admin logs (file only)
Allows spawning dispenser cartridges with different sizes and reagents
2015-06-02 02:24:32 +01:00
Chinsky
26167895b5
Merge pull request #9621 from PsiOmegaDelta/150601-Adminhelp
...
Admin PM replies now sent to IRC.
2015-06-01 21:08:22 +03:00
PsiOmega
0aade86d5f
Admin PM replies now sent to IRC.
...
Now both ahelps and their replies should be sent to an IRC channel, if configured.
2015-06-01 19:43:54 +02:00
Yoshax
63f253a301
Makes hyposprays start empty
2015-06-01 17:17:16 +01:00
PsiOmega
40a373a7fe
APC event tweak.
...
The APC event now instead checks for the new is_critical flag.
2015-06-01 18:13:05 +02:00
PsiOmega
3d49ad3927
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/jobs/job/job.dm
code/game/jobs/job/silicon.dm
code/game/objects/items/weapons/surgery_tools.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/mob/living/carbon/human/species/station/station.dm
code/modules/organs/organ_external.dm
icons/obj/objects.dmi
2015-06-01 09:07:03 +02:00
Techhead0
637135b0b5
Removes relative pathing, adds better comments.
2015-06-01 00:02:56 -04:00
Techhead0
2b8d6db61e
Refactors Prison Break event.
...
Affects the Brig, Virology, Xenobiology or all three.
Adds warning messages to Engineering request consoles and AI.
Prevents doors from bolting open if unpowered
Reduces light overload frequency.
2015-05-31 23:25:52 -04:00
Chinsky
ff592c751a
Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks
...
End game tweaks
2015-05-31 23:55:08 +03:00
Chinsky
d39d9deeeb
Merge pull request #9417 from mwerezak/chem-kinetics
...
Chemistry reaction cleanup, Implements reaction-over-time and yield
2015-05-31 23:54:39 +03:00
GinjaNinja32
c1cc002109
Merge pull request #9601 from Techhead0/survivalBox
...
Survival box and job spawning fixes.
2015-05-31 19:47:44 +01:00
Techhead0
9047bbe2a2
Removes O2 tank and spare mask from Vox boxes.
2015-05-31 14:17:24 -04:00
Techhead0
0f0fcf2d46
Re-adds extended oxygen tanks to relevant jobs.
2015-05-31 14:08:46 -04:00
Techhead0
99e9172d31
Cleans up Vox survival gear, adds belt icons to emergency nitrogen tanks.
2015-05-31 13:04:32 -04:00
PsiOmegaDelta
659873d943
Merge pull request #9598 from mwerezak/knifing
...
Polishes the knifing mechanic
2015-05-31 18:50:12 +02:00
Techhead0
3620c49b08
Fixes #9462
2015-05-31 12:41:39 -04:00
mwerezak
3f5976bc3b
Updates knifing
...
Fixes weirdness with knifing where attempting to knife someone before
`world.time >= (G.last_action + 20)` could be met.
Knifing damage scales with weapon force and an attempted measure of
throat protection.
Knifing switches on harm intent.
2015-05-31 11:36:38 -04:00
PsiOmegaDelta
8d13f434f0
Merge pull request #9587 from Zuhayr/ipcfixes
...
IPC fixes
2015-05-31 15:53:11 +02:00
Chinsky
10218eb8c9
Merge pull request #9573 from Zuhayr/chairs
...
Chair update.
2015-05-31 11:33:24 +03:00
