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 |
|
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 |
|
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 |
|
mwerezak
|
d62ff87ec9
|
Fixes #10689
Also some refactoring of locker stuffing.
|
2015-08-22 14:32:15 -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 |
|
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 |
|
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
|
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 |
|
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 |
|
PsiOmegaDelta
|
c560bd8d79
|
Merge pull request #10404 from mwerezak/stack-fix
Material stack related fixes
|
2015-08-08 09:56:25 +02:00 |
|
PsiOmegaDelta
|
a6d9002806
|
Merge pull request #10442 from Baystation12/dev-freeze
Dev freeze
|
2015-08-07 10:37:47 +02:00 |
|
PsiOmegaDelta
|
8ca5d01dcf
|
Crematorium Destroy()
Adds a missing Destroy() for the crematorium tray.
Changes X.loc = loc into X.forceMove(loc).
|
2015-08-06 08:39:24 +02:00 |
|
PsiOmegaDelta
|
4d57f5ef66
|
Uses raised TM symbol in the mirror name.
Now uses the HTML code for the trademark symbol.
|
2015-08-04 10:41:28 +02:00 |
|
mwerezak
|
d1bd146b1a
|
Changes reinforced glass material name
Gives the reinforced glass material a name that is easier to verify for
correctness.
|
2015-08-03 23:01:34 -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
|
93e914f021
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/setup.dm
|
2015-07-30 10:49:37 +02:00 |
|
mwerezak
|
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 |
|
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 |
|
PsiOmegaDelta
|
9b0497e01e
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
|
2015-07-24 10:46:32 +02:00 |
|
Kelenius
|
d509bdbbfe
|
Uses capitalize()
|
2015-07-21 11:58:39 +03:00 |
|
Kelenius
|
6b2daae752
|
Fixes #6264 - labeling janicart messes its ui
Janicart now uses nanoui and is immune to labeling screwing up its
interface
I've even resisted making pointless spacing changes this time!
|
2015-07-20 16:27:58 +03:00 |
|
GinjaNinja32
|
0c1aee8074
|
Fixes <span class='class>, makes Travis check it
|
2015-07-18 21:13:32 +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 |
|
PsiOmegaDelta
|
8da7141af1
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/simple_animal/simple_animal.dm
|
2015-07-14 08:11:11 +02:00 |
|
PsiOmega
|
e11ffcdfc9
|
Fixes #10143.
Morgue/crematorium trays should now garbage collect properly.
|
2015-07-13 15:06:02 +02:00 |
|
mwerezak
|
0fc12eb22b
|
Fixes #9927
Fixes issues with deca code crates.
|
2015-07-13 00:45:36 -04:00 |
|
PsiOmegaDelta
|
c6f4f7fcee
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
|
2015-07-12 15:14:43 +02:00 |
|
Zuhayr
|
c59dc2445c
|
Fixes #10062 and #10061
|
2015-07-12 07:04:35 +09:30 |
|
mwerezak
|
c7ff5eebe3
|
Updates hats to use item_state_slots where necessary.
|
2015-06-27 23:33:33 -04:00 |
|
PsiOmega
|
f25e8a7a67
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/game/objects/items/stacks/tiles/plasteel.dm
code/game/objects/items/stacks/tiles/tile_types.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/pai/pai.dm
code/modules/surgery/implant.dm
code/setup.dm
|
2015-06-26 20:28:47 +02:00 |
|
PsiOmegaDelta
|
8fef02501c
|
Merge pull request #9936 from mwerezak/fire
Balances fire to work better with very low concentration phoron gas burning
|
2015-06-26 13:34:21 +02:00 |
|
mwerezak
|
9d7a1b9ad6
|
Fixes misleading path and proc name
|
2015-06-26 00:40:31 -04:00 |
|
PsiOmega
|
8843aa2402
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/game/machinery/alarm.dm
html/changelogs/.all_changelog.yml
|
2015-06-24 18:15:28 +02:00 |
|
mwerezak
|
aa0b23e205
|
Fixes #9910
|
2015-06-24 00:20: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 |
|
mwerezak
|
6e9d73e792
|
Fixes #9585
Allows objects with PASSTABLE to pass over beds and chairs. Moves
chempuff passflags up to the parent water effect.
|
2015-06-21 00:44:38 -04:00 |
|
PsiOmegaDelta
|
405131a54e
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/projectiles/guns/energy/stun.dm
code/modules/projectiles/guns/projectile/pistol.dm
code/modules/projectiles/guns/projectile/revolver.dm
|
2015-06-20 20:40:06 +02:00 |
|
GinjaNinja32
|
82aa88c777
|
Merge pull request #9862 from Zuhayr/dev
Fixes
|
2015-06-20 17:27:26 +01:00 |
|