Zuhayr
b9c01bf2f2
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/objects/items/devices/uplink.dm
2015-09-07 11:17:06 +09:30
PsiOmega
cc960624b9
Fixes mercenary mode not listing bought items.
...
The mercenary leader now spawns with the uplink, as is set as its owner.
2015-09-06 10:43:09 +02:00
PsiOmega
69fde6af03
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/antagonist/alien/borer.dm
code/game/gamemodes/game_mode.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/objects/items/robot/robot_parts.dm
code/setup.dm
2015-09-05 09:24:30 +02:00
Zuhayr
23fb8d8b99
Antag system cleanup/fixes.
2015-09-04 18:28:05 +09:30
PsiOmegaDelta
88250ad57f
Merge pull request #10939 from Baystation12/master
...
Dev-freeze
2015-08-30 10:20:32 +02:00
PsiOmega
22262507b9
Only living mobs now trigger shrapnel.
...
Fixes issue with manually moving ghosts would step on shrapnel, with glass noise and all.
On dev this issue is expanded further as all known movements means use forceMove.
2015-08-29 10:03:58 +02:00
PsiOmegaDelta
713a7bd654
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/devices/flashlight.dm
2015-08-25 08:12:39 +02:00
Zuhayr
bcca0d4aee
Merge pull request #10842 from mwerezak/showers
...
Fixes cryogenic showers
2015-08-25 07:38:19 +09:30
HarpyEagle
e03585898d
Cleans up flashlight fix
...
Moves icon state changes into update_icon(), less duplicated code. Also
makes glowing slime extracts less dumb.
2015-08-24 16:31:31 -04:00
PsiOmegaDelta
c376c08cc0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/girders.dm
code/modules/mob/living/carbon/human/human_damage.dm
2015-08-24 10:23:12 +02:00
Zuhayr
863d75076d
Merge pull request #10759 from mwerezak/girders
...
Fixes reinforcing girders through windows, adds an SS13-like interface for reinforcing
2015-08-24 17:28:08 +09:30
PsiOmegaDelta
0b163b89ae
Fixes #10815 .
...
Now uses audible message. Added a message for deaf mobs.
2015-08-24 09:16:35 +02:00
mwerezak
286e16a0f3
Fixes cryogenic showers
...
Changes shower temperature settings to use more reasonable temperature values. A menu is now shown when adjusting shower temperature.
2015-08-24 00:11:40 -04:00
Chinsky
1a7b0e33a4
Merge pull request #10758 from FrickenChris101/patch-1
...
Flashlight Icon toggle fix
2015-08-24 00:40:26 +03:00
Zuhayr
89f498e3e8
Merge pull request #10811 from mwerezak/qdel
...
Fixes
2015-08-23 07:41:10 +09:30
mwerezak
d62ff87ec9
Fixes #10689
...
Also some refactoring of locker stuffing.
2015-08-22 14:32:15 -04:00
mwerezak
13c760c5bb
Fixes #9453 and fixes #10614
2015-08-22 11:09:17 -04:00
GinjaNinja32
4e56b82ec0
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-08-22 15:28:49 +01:00
mwerezak
cfa8ab3fd0
Removes bear traps from the custodial closet, adds autolathe recipe
2015-08-22 02:31:19 -04:00
Zuhayr
3c477dfa5e
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/jobs/access.dm
code/modules/mob/living/carbon/brain/brain_item.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/organs/organ_icon.dm
2015-08-22 03:11:53 +09:30
Zuhayr
bb82f80885
Added get_bodytype() species proc as groundwork for subspecies.
...
Conflicts:
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/organs/organ_icon.dm
2015-08-22 02:53:16 +09:30
Zuhayr
8701205783
Pariah nerfs.
...
Conflicts:
code/modules/mob/living/carbon/human/species/outsider/vox.dm
code/modules/organs/organ_alien.dm
2015-08-22 02:51:42 +09:30
mwerezak
8626fbfd39
Removes the reinforce girder verb
2015-08-20 23:50:40 -04:00
mwerezak
db7ba70415
Adds SS13-like interface for reinforcing girders
2015-08-20 23:50:16 -04:00
mwerezak
efc3121f68
Fixes reinforcing girders through windows, unbalanced span
2015-08-19 20:41:24 -04:00
FrickenChris101
a4b3ab1ca5
Flashlight Icon toggle fix
...
Just added additional code to update_brightness call and initialize.. Wasn't properly reflecting light being on or off.
2015-08-19 20:17:59 -04:00
PsiOmega
75c7313c46
On merge changes and map conflict fixes.
2015-08-18 18:19:51 +02:00
PsiOmegaDelta
55bc41241f
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/setup.dm
2015-08-17 09:37:49 +02:00
PsiOmegaDelta
1dcdb423c7
Merge pull request #10685 from mwerezak/skipjack
...
Fixes
2015-08-17 06:56:50 +02:00
mwerezak
f09b754a19
Fixes #10636
2015-08-16 15:20:59 -04:00
mwerezak
887a515483
Fixes #10659
2015-08-16 14:58:50 -04:00
PsiOmega
21fd8d825d
Makes the private AI channel truly private.
2015-08-16 15:43:28 +02:00
PsiOmega
3a08e2884a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/crates_lockers/largecrate.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/research/circuitprinter.dm
2015-08-15 10:52:17 +02:00
Null Snapshot
0255b79114
Fixes a problem with crates containing animals not spitting out their mobs.
2015-08-14 22:47:53 -07:00
Snapshot
5f5671d21f
Merge pull request #10647 from mwerezak/acids
...
Fixes #10645
2015-08-14 22:22:41 -07:00
mwerezak
133bc96344
Fixes #10645
...
Sets unacidable where appropriate.
2015-08-14 23:20:10 -04:00
PsiOmegaDelta
3a55b130a0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
.travis.yml
code/modules/virus2/disease2.dm
maps/exodus-5.dmm
2015-08-14 08:34:42 +02:00
PsiOmegaDelta
d1e8f670b2
qdel(reagent) adjustments.
...
Attempts to ensure qdel(reagents) only occur once per Destroy()
2015-08-13 10:26:31 +02:00
PsiOmegaDelta
1b10f78940
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-08-13 09:01:10 +02:00
GinjaNinja32
792d6e2864
Merge pull request #10579 from mwerezak/misc
...
Fixes
2015-08-12 22:21:34 +01:00
HarpyEagle
19fbc71249
Removes req_amount from stack_recipe_list
...
The stack_recipe_list datum itself is not used to make anything, so having
a req_amount made little sense. Fixes #10572 .
2015-08-12 15:54:16 -04:00
PsiOmega
ba240cb768
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/antagonist/station/rogue_ai.dm
code/game/machinery/atmoalter/portable_atmospherics.dm
code/game/machinery/spaceheater.dm
code/modules/clothing/head/soft_caps.dm
maps/exodus-5.dmm
2015-08-12 21:18:18 +02:00
Chinsky
0e52b3d4df
Merge pull request #10562 from PsiOmegaDelta/150812-OneCrew
...
Fixes the One Crew Member module.
2015-08-12 20:38:52 +03:00
Chinsky
e562affd13
Merge pull request #10551 from PsiOmegaDelta/150812-RuntimeFixes
...
Runtime fixes.
2015-08-12 20:38:20 +03:00
HarpyEagle
a62edc5b3a
Fixes #10548
2015-08-12 12:21:28 -04:00
PsiOmegaDelta
249db0b03d
Fixes the One Crew Member module.
...
Didn't return properly in install().
Override transmitInstructions() when addAdditionalLaws() was more than sufficient.
2015-08-12 14:42:52 +02:00
PsiOmegaDelta
3e4ec4d7b7
NanoUI windows now close on Destroy(), preventing all sorts of qdel issues.
2015-08-12 09:41:22 +02:00
PsiOmega
e4f6436a85
Fixes #10494 .
...
Borgs have their very own custom little headset, so cute.
2015-08-11 21:11:16 +02:00
GinjaNinja32
631ff21980
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/game/objects/items/weapons/implants/implantcase.dm
code/game/objects/items/weapons/melee/energy.dm
code/modules/mob/living/carbon/human/emote.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/silicon/robot/drone/drone.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/nano/modules/crew_monitor.dm
code/modules/organs/organ_internal.dm
2015-08-11 18:47:05 +01:00
Chinsky
7b1656f40c
Merge pull request #10470 from Karolis2011/dev-freeze
...
[Dev-Freeze] Replace \red with <span> in runes.dm, fix many "his/her/their" gender messages
2015-08-11 20:07:06 +03:00
