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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
SomeoneElse
|
8c0984d5b1
|
Fix gender issues, some typos from various files
|
2015-08-11 13:41:40 +03:00 |
|
Kelenius
|
1324e69a19
|
Fixes #10466 - chem implant can't be loaded
What the literal shit.
|
2015-08-11 10:26:22 +03:00 |
|
PsiOmega
|
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 |
|
HarpyEagle
|
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 |
|
mwerezak
|
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 |
|
mwerezak
|
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 |
|
PsiOmegaDelta
|
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 |
|
Zuhayr
|
ad63247749
|
Merge pull request #10382 from Mloc/freezyfixes
fixes
|
2015-07-31 03:55:34 +09:30 |
|
PsiOmegaDelta
|
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 |
|
Zuhayr
|
64ccd8a048
|
Merge pull request #10269 from Mloc/lightwrite
lighting work
|
2015-07-27 11:41:14 +09:30 |
|
Mloc
|
fe4490a295
|
fixes #10316
Signed-off-by: Mloc <colmohici@gmail.com>
|
2015-07-26 20:53:13 +01:00 |
|
PsiOmegaDelta
|
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 |
|
Kelenius
|
7efaab0ab4
|
Fixes #9540 - borg message when using DA on storage
Radically. Frankly, this message is useless.
|
2015-07-23 10:10:10 +03:00 |
|
Mloc
|
65ac3d97d0
|
Revert "get rid of mob.see_in_dark and species.darksight"
This reverts commit 278a4c38ec.
|
2015-07-22 15:14:40 +01:00 |
|
PsiOmegaDelta
|
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 |
|
Zuhayr
|
7dada28d8d
|
Fixes #10146
|
2015-07-14 05:18:57 +09:30 |
|
HarpyEagle
|
e0f89532e0
|
Fixes #10078
|
2015-07-13 11:08:58 -04:00 |
|
Ccomp5950
|
889019b445
|
Merge pull request #10163 from PsiOmegaDelta/150713-Fixes
Fixes
|
2015-07-13 09:35:58 -04:00 |
|
PsiOmega
|
9ba21f3079
|
Tried to resolve ID cards not GCing properly. Sorted some awful : uses instead.
|
2015-07-13 10:18:08 +02:00 |
|
GinjaNinja32
|
b04ed47e2f
|
Merge pull request #10070 from Mloc/lightwrite-2
Lighting overlay changes + optimizations
|
2015-07-12 15:51:44 +01:00 |
|
PsiOmegaDelta
|
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 |
|
GinjaNinja32
|
c24f8f3452
|
Merge pull request #10088 from mwerezak/inhand-overlays2
Ports grenade and flash in-hand sprites
|
2015-07-10 21:12:11 +01:00 |
|
mwerezak
|
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 |
|
Iamgoofball
|
32a5582215
|
Fixes #10085 (probably)
if this doesn't fix it then ????
|
2015-07-10 02:32:35 -07:00 |
|
HarpyEagle
|
cf88e87434
|
Fixes mounted RCD balance issues
|
2015-07-09 16:54:01 -04:00 |
|
Mloc
|
278a4c38ec
|
get rid of mob.see_in_dark and species.darksight
They don't work with the current lighting system and cause weird artifacts.
Signed-off-by: Mloc <colmohici@gmail.com>
|
2015-07-09 19:17:04 +01:00 |
|
Chinsky
|
c7d9ce4697
|
Merge pull request #10046 from mwerezak/custom-item-icons
Makes custom items use the host item's inhand sprites if none are provided, knife fixes
|
2015-07-09 20:52:38 +03:00 |
|
PsiOmegaDelta
|
df83203356
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/modules/hydroponics/seed_mobs.dm
code/modules/materials/materials.dm
|
2015-07-09 08:45:49 +02:00 |
|
Zuhayr
|
d47c2c8a02
|
Fixes #10013
|
2015-07-09 04:05:40 +09:30 |
|
mwerezak
|
01104eda45
|
Fixes utensil force dividers.
Fixes utensil knives deal more damage than a chopping knife, and spoons being a potentially deadly weapon.
|
2015-07-08 01:37:07 -04:00 |
|
PsiOmegaDelta
|
ed5a12c2a2
|
Revert "[DNM] Makes custom items use the host item's inhand sprites if none are provided, knife fixes"
|
2015-07-07 17:14:42 +02:00 |
|
mwerezak
|
b7ee6e11fc
|
Swaps force divisors between kitchen knives and utensil knives.
Because why does the utensil deal more damage than a chopping knife?
|
2015-07-03 22:02:28 -04:00 |
|
mwerezak
|
b2d3711c11
|
Fixes knife inhand states
|
2015-07-03 21:58:11 -04:00 |
|
PsiOmegaDelta
|
9698def0e7
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/modules/nano/modules/human_appearance.dm
|
2015-06-22 16:59:19 +02:00 |
|
GinjaNinja32
|
9c32851ba5
|
Merge pull request #9871 from mwerezak/extinguisher
Fire Extinguishers
|
2015-06-22 15:36:55 +01:00 |
|
Zuhayr
|
48cf00ca54
|
Merge with dev-freeze.
|
2015-06-21 20:45:47 +09:30 |
|
PsiOmegaDelta
|
3d572ccc27
|
Merge pull request #9874 from mwerezak/fixes
Dev-freeze Fixes
|
2015-06-21 09:04:08 +02:00 |
|
mwerezak
|
712dc39185
|
Fixes #9729
|
2015-06-21 03:00:34 -04:00 |
|
mwerezak
|
2f1a6eaf83
|
Adjusts w_class of beach ball and scroll
|
2015-06-21 01:46:10 -04:00 |
|