11d959e767
Adds client image based t-scanner
...
Replaces the t_scanner implementation with one that sends overlays to the client holding the t-ray item. Fixes #9437
2015-08-08 22:26:38 -04:00
e875a7ce48
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/computer3/buildandrepair.dm
code/game/objects/items/devices/lightreplacer.dm
code/modules/research/circuitprinter.dm
code/modules/research/protolathe.dm
2015-08-08 15:34:51 +02:00
c560bd8d79
Merge pull request #10404 from mwerezak/stack-fix
...
Material stack related fixes
2015-08-08 09:56:25 +02:00
b64744c4c6
Adds frag grenades.
2015-08-08 00:51:29 -04:00
d911badae8
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/7/2015_bay_merge
...
Conflicts:
.travis.yml
polaris.dme
2015-08-07 20:25:57 -04:00
fc7e89380e
More material renames
...
Gives several materials shorter and easier to type names, updating the
display_name where applicable. Also fixed a slightly mismatched variable
type.
2015-08-07 17:10:35 -04:00
210d8fac22
Updates mechfab to not be terrible, WIP
2015-08-07 18:01:12 +03:00
3e266ab377
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-05 09:25:53 +02:00
6b01a67c50
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/admin/admin_verbs.dm
code/modules/nano/interaction/default.dm
2015-08-05 09:16:50 +02:00
595b58197d
fix pAI radios not working
2015-08-05 00:49:28 +01:00
95240c989b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/3/2015_bay_sync
...
Conflicts:
polaris.dme
2015-08-03 22:13:18 -04:00
998b72bcd8
Fixes #10372 .
...
Removes snowflake attack code.
2015-08-03 09:20:36 +02:00
0ceb0e291d
Fixes #10314
...
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
2015-08-02 00:01:10 -04:00
e3609bac94
Adds common proc to obtain the material of an object
...
Adds a common get_material() proc to objects, and implements overrides
where applicable
2015-08-01 23:03:21 -04:00
f8d86900a5
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/new_player/preferences_setup.dm
code/setup.dm
2015-08-01 19:45:42 +02:00
2a51b778d6
Fixes #9611
2015-08-01 21:10:48 +09:30
c28b3721b4
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/unsorted.dm
code/modules/clothing/glasses/glasses.dm
code/modules/mob/living/carbon/human/life.dm
code/setup.dm
2015-07-31 10:00:16 +02:00
ad63247749
Merge pull request #10382 from Mloc/freezyfixes
...
fixes
2015-07-31 03:55:34 +09:30
93e914f021
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/setup.dm
2015-07-30 10:49:37 +02:00
3bb88b327c
Fixes #10353
...
- Fixes icons not updating properly
- Also fixes a runtime.
2015-07-29 23:16:27 +02: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
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
5ebe86ed8d
Adds the ability for mercenaries to false crew arrival announcements and records.
2015-07-28 11:58:16 +02:00
385a21772d
Adds anti-photon grenades.
2015-07-28 09:25:38 +02:00
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
0ba7643217
Updates files as necessary to adhere to the new standard.
2015-07-27 09:32:51 +02: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
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
fe4490a295
fixes #10316
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-07-26 20:53:13 +01:00
f3c9a7224b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/storage/storage.dm
code/modules/reagents/reagent_containers/borghydro.dm
2015-07-24 10:53:57 +02:00
130c234569
Allows traitors the option of purchasing the c20r or sts35
2015-07-23 20:04:46 -04:00
7efaab0ab4
Fixes #9540 - borg message when using DA on storage
...
Radically. Frankly, this message is useless.
2015-07-23 10:10:10 +03:00
65ac3d97d0
Revert "get rid of mob.see_in_dark and species.darksight"
...
This reverts commit 278a4c38ec
2015-07-22 15:14:40 +01:00
0c1aee8074
Fixes <span class='class>, makes Travis check it
2015-07-18 21:13:32 +01:00
7e8622b76a
Fixes #8210
...
Medicine stacks will now give one message per item category.
For example:
You clean and seal an ugly ripped cut and a ripped cut on Kelenius's
right arm.
You clean and seal an ugly ripped cut and a cut on Kelenius's left arm.
You clean and seal a cut, a cut, and a cut on Kelenius's left arm.
Code cleanup, spanclasses, spacing, stuff.
2015-07-17 09:24:13 +03:00
6eece8ac45
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/16/2015_bay_merge_2
...
Conflicts:
.travis.yml
polaris.dme
2015-07-16 22:46:53 -04:00
34fdc4712e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/names.dm
code/game/jobs/job/silicon.dm
code/game/objects/items.dm
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/nano/modules/alarm_monitor.dm
code/setup.dm
2015-07-14 08:21:12 +02:00
7dada28d8d
Fixes #10146
2015-07-14 05:18:57 +09:30
e0f89532e0
Fixes #10078
2015-07-13 11:08:58 -04:00
889019b445
Merge pull request #10163 from PsiOmegaDelta/150713-Fixes
...
Fixes
2015-07-13 09:35:58 -04:00
9ba21f3079
Tried to resolve ID cards not GCing properly. Sorted some awful : uses instead.
2015-07-13 10:18:08 +02:00
b04ed47e2f
Merge pull request #10070 from Mloc/lightwrite-2
...
Lighting overlay changes + optimizations
2015-07-12 15:51:44 +01:00
9b4d09c974
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/unsorted.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/grenades/emgrenade.dm
code/modules/clothing/spacesuits/rig/rig_attackby.dm
2015-07-11 10:58:49 +02:00
c24f8f3452
Merge pull request #10088 from mwerezak/inhand-overlays2
...
Ports grenade and flash in-hand sprites
2015-07-10 21:12:11 +01:00
fb1eeae640
Adds inhand sprites for grenades
...
Adds inhand sprites for generic grenades, flashbang, and emp grenade.
Conflicts:
code/game/objects/items/weapons/grenades/emgrenade.dm
2015-07-10 11:00:29 -04:00
265802d270
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/controllers/_DynamicAreaLighting_TG.dm
code/game/objects/effects/chem/chemsmoke.dm
code/game/objects/explosion.dm
2015-07-10 12:57:46 +02:00
32a5582215
Fixes #10085 (probably)
...
if this doesn't fix it then ????
2015-07-10 02:32:35 -07:00
a36844cf84
Adds inhand sprites for the flash
2015-07-10 00:27:33 -04:00
8c4cc815ff
Adds the ability to draw arrows with crayon
2015-07-09 23:35:06 -04:00
mwerezak