PsiOmegaDelta
a29bbc28c0
Cargo tugs now uses a more finally grained incapacitation check.
2015-12-11 13:48:18 +01:00
Datraen
6120e09684
Fixes the inability to use cargo tugs
2015-12-11 11:08:00 +01:00
Chinsky
60e785da97
Merge pull request #11458 from PsiOmegaDelta/151117-MultitoolPower
...
Multitool Upgrade
2015-12-09 21:34:12 +03:00
Chinsky
64b5623d70
Merge pull request #11544 from atlantiscze/inflatables-squashed
...
Robot inflatables v2
2015-12-09 21:32:27 +03:00
GinjaNinja32
1921c35231
fix issues with indented absolute path definitions
2015-12-09 14:12:54 +00:00
Atlantis
d61a34e054
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into inflatables-squashed
2015-12-09 14:47:02 +01:00
PsiOmegaDelta
185faaeb82
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
code/game/turfs/turf.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/mob_grab_specials.dm
2015-12-08 08:23:10 +01:00
PsiOmegaDelta
0f986b0098
Compilation fixes.
2015-12-08 08:10:59 +01:00
PsiOmegaDelta
5fcf13ac55
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/surgery_limbattachment.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/organs/organ.dm
code/modules/organs/organ_external.dm
code/setup.dm
2015-12-08 08:09:37 +01:00
PsiOmegaDelta
2402b3ccd8
Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
2015-12-07 17:56:27 +01:00
Chinsky
cbf51f9c73
Merge pull request #11605 from mwerezak/click-cooldown
...
Adds click cooldowns
2015-12-07 19:56:23 +03:00
Atlantis
0e78d9b51c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into inflatables-squashed
2015-12-07 13:55:48 +01:00
Atlantis
e493fe0134
Robot inflatables v2
...
- Re-opened version of #9274 with few minor adjustments and reduced commit amount.
- Creates new device - Inflatables Dispenser(ID) that can be used to deploy/undeploy inflatables
- IDs are added to Engineering, Construction and Crisis robot modules
- Three IDs replace three boxes of inflatables in engineering storage.
- Re-adjusted weights of inflatables. IDs and boxes may now fit in backpacks, deflated inflatables may fit into pocket.
2015-12-07 13:52:51 +01:00
BlueNexus
467817986d
Reverted secbot access
...
Since Psi mentioned it, Secbots should probably be the exception.
2015-12-07 11:51:30 +00:00
BlueNexus
2ff05a9853
Gave the Roboticist farmbot access
2015-12-07 11:43:30 +00:00
BlueNexus
c2c521e986
Gave the Roboticist floorbot access
2015-12-07 11:39:58 +00:00
BlueNexus
34df328d04
Gave the Roboticist medbot access
2015-12-07 11:39:29 +00:00
BlueNexus
195eada125
Gave the Roboticist secbot access
2015-12-07 11:39:02 +00:00
BlueNexus
f1a25e0957
Gave the Roboticist cleanbot access
...
Using the browser version of github at the moment, so expect a commit for each bot.
2015-12-07 11:38:08 +00:00
PsiOmegaDelta
12fb0bdb10
Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
...
Conflicts:
code/modules/nano/nanoui.dm
2015-12-06 12:10:33 +01:00
PsiOmegaDelta
ac3f159125
Incapacitation.
2015-12-06 11:53:46 +01:00
PsiOmegaDelta
62f7ddac25
Compilation fixes.
2015-12-06 11:50:08 +01:00
PsiOmegaDelta
b89e19e5a5
Merge remote-tracking branch 'upstream/dev-freeze' into dev.
...
Conflicts:
code/datums/datacore.dm
code/defines/procs/records.dm
code/game/machinery/camera/camera_assembly.dm
code/modules/client/preferences.dm
code/modules/client/preferences_savefile.dm
code/modules/mob/language/station.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/mob/living/carbon/human/species/station/station.dm
code/modules/surgery/organs_internal.dm
html/changelogs/.all_changelog.yml
2015-12-06 11:48:20 +01:00
PsiOmegaDelta
6a22086c17
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/verbs/suicide.dm
code/modules/nano/modules/crew_monitor.dm
2015-12-06 11:34:36 +01:00
mwerezak
9135a609cb
Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468
2015-12-06 04:17:52 -05:00
mwerezak
fa6c8415ea
Adds click cooldowns to common healing and repair actions
2015-12-06 00:23:49 -05:00
mwerezak
a7d80a93e5
Fixes mismatching diona internal organ tags
2015-12-05 23:39:16 -05:00
mwerezak
a5411f26c5
Fixes runtime when moving with missing legs or feet
2015-12-05 18:10:39 -05:00
GinjaNinja32
19b24452db
Merge pull request #11443 from Hubblenaut/dev
...
Changes to Mob Bump Mechanics
2015-12-05 19:01:56 +00:00
GinjaNinja32
9c76f1dfb4
Merge pull request #11547 from Kearel/alcatrazSynth
...
Adds Alcatraz Icons for Borgs
2015-12-05 18:57:52 +00:00
Kearel
45c2f54998
Change name from alcatraz to eyebot
2015-12-05 12:42:11 -06:00
GinjaNinja32
58dda1e96d
fix autohiss for fully-capitalised strings
2015-12-05 06:53:26 +00:00
Zuhayr
834f86241a
Alters an unEquip() conditional in Give().
2015-12-05 00:49:35 +10:30
PsiOmegaDelta
94b999772b
Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
...
Conflicts:
code/game/machinery/computer/atmos_alert.dm
code/game/machinery/computer/station_alert.dm
2015-12-04 11:22:27 +01:00
PsiOmegaDelta
416c24f3e2
Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
2015-12-04 11:20:39 +01:00
Chinsky
939c1a3146
Merge pull request #11376 from NullSnapshot/dev-freeze
...
Bunch of IPC fixes.
2015-12-04 11:28:25 +03:00
Chinsky
5df915b638
Merge pull request #11534 from PsiOmegaDelta/151129-GeneralTasks
...
Adds a process for general tasks
2015-12-04 11:26:00 +03:00
Zuhayr
398541f4eb
Amendments.
2015-12-04 18:14:40 +10:30
Zuhayr
0cf5a709d1
Refactored give().
2015-12-04 17:58:53 +10:30
Zuhayr
7c85f846eb
put_in_hands() refactor.
2015-12-04 17:38:58 +10:30
Zuhayr
5561964204
Tweaks to previous commits.
2015-12-03 22:56:19 -08:00
Zuhayr
cc8b37562a
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into drones2
2015-12-04 16:53:44 +10:30
GinjaNinja32
7779cd218a
Merge pull request #11578 from PsiOmegaDelta/151203-RestrainedIncapacitation
...
Makes it possible to ignore some incapacitation checks.
2015-12-04 05:14:16 +00:00
PsiOmegaDelta
ff15635aef
Makes it possible to ignore some incapacitation checks.
...
This fixes #11576 . Also corrects the viewers() usage in visible_message.
2015-12-03 12:52:38 +01:00
PsiOmegaDelta
448e743308
Merge remote-tracking branch 'upstream/dev' into 151129-GeneralTasks
...
Conflicts:
code/game/machinery/computer/atmos_alert.dm
2015-12-03 10:18:39 +01:00
PsiOmegaDelta
c30a518221
Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
...
Conflicts:
code/modules/mob/living/silicon/ai/ai.dm
2015-12-02 09:18:07 +01:00
Zuhayr
e83a8adc2c
Generalizes the accessory system to work for suits.
2015-12-02 18:04:21 +10:30
GinjaNinja32
8303404678
Merge pull request #11553 from PsiOmegaDelta/151201-RandomLobby
...
Adds the ability to have random lobby screens.
2015-12-01 23:58:08 +00:00
GinjaNinja32
f9c513a3dd
Merge pull request #11552 from PsiOmegaDelta/151201-HoloMovement
...
The AI can now toggle hologram eye tracking.
2015-12-01 23:57:59 +00:00
Zuhayr
a56618119a
Merge pull request #11502 from PsiOmegaDelta/151121-InWorldParams
...
Replaces 'in world' arguments.
2015-12-02 09:56:28 +10:30
