GinjaNinja32
e9ff87fbd6
Lattices, shuttle windows, and shuttle engines now rotate correctly with client.dir
2015-08-02 20:50:47 +01:00
GinjaNinja32
16bcc04c83
Windows now rotate correctly with client.dir
2015-08-02 18:06:02 +01: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
Kelenius
f948932bee
Updates sleepers
...
WIP
2015-07-29 11:17:15 +03: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
Atlantis
47f0b47c46
Borosilicate windows
...
- This is the second part of my PR that added phoron windows to protect the SM core from fires
- Borosilicate windows are heat resistant versions of regular glass windows. This PR renames them (from phoron windows/phoron glass/etc.) and adjusts the fire resistances
- They are no longer completely fireproof. Instead, all window types have fire resistance variables - maximal safe temperature and amount of damage taken if temperature exceeds this limit.
- Regular: 100C, Regular Reinforced: 750C, Borosilicate: 2000C, Borosilicate Reinforced: 4000C.
- Adds alloying recipe to make borosilicate glass. 2 sand + 1 platinum alloy.
2015-07-27 13:49:12 +02:00
PsiOmegaDelta
0ba7643217
Updates files as necessary to adhere to the new standard.
2015-07-27 09:32:51 +02: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
Dragor
697157a6bc
Changes all gun names to generic descriptive names, moves names into desc. Updates the descriptions of various guns to be more loreful.
2015-07-15 22:08:21 -04: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
32b95445e3
Gives changeNextMove() a better name, default define
2015-06-30 22:29:45 -04:00
mwerezak
087a978d56
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown
...
Conflicts:
code/_onclick/click.dm
code/_onclick/telekinesis.dm
code/game/objects/items.dm
code/game/objects/structures/grille.dm
code/game/turfs/simulated/walls.dm
code/modules/mob/living/carbon/resist.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2015-06-28 22:35:14 -04:00
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
PsiOmegaDelta
a036e8d47e
Adds support for polarized windows.
2015-06-25 16:09:04 +02:00
Zuhayr
93884c6a3e
Spawners are now obj/effect, can be used post-roundstart, and use pooling.
2015-06-25 23:11:09 +09:30
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
Zuhayr
7ede629cde
Ported window spawner, tyvm WrongEnd
2015-06-24 12:57:04 +09:30
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
Zuhayr
6f00d831e5
Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct
...
Base proc: emag_act
2015-06-21 01:18:25 +09:30
Zuhayr
12507e6872
Fixes #9866
2015-06-21 01:13:41 +09:30
Zuhayr
9f9a5cc49e
Fixes #9843
2015-06-20 21:37:41 +09:30
PsiOmegaDelta
1558bd5b75
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/toys.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/living_defense.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
code/modules/reagents/reagent_containers.dm
html/changelogs/.all_changelog.yml
2015-06-19 10:19:08 +02:00
Hubblenaut
5a026b1553
Overhauls berets, adds corporate black
2015-06-18 18:10:35 +02:00
GinjaNinja32
078cfb2533
Merge pull request #9774 from mwerezak/chem-touch
...
Reagent splashing, mob fire
2015-06-17 10:05:11 +01:00
PsiOmegaDelta
772488fadc
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
code/setup.dm
maps/exodus-1.dmm
maps/exodus-5.dmm
2015-06-17 09:33:34 +02:00
mwerezak
70433b4367
Makes showers wash away touching reagents
...
Also moves reagent permeability to it's own proc, and makes splash_mob respect copy
2015-06-16 16:26:04 -04:00
PsiOmegaDelta
06a1ece4b8
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/ZAS/Controller.dm
code/datums/mind.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/brain/posibrain.dm
code/modules/mob/living/silicon/pai/pai.dm
2015-06-16 10:52:33 +02:00
PsiOmegaDelta
cc7c502fb8
Updates emag attackby usages to emag_act where it's not too much of a headache.
2015-06-16 09:34:13 +02:00
PsiOmega
0a05c2659f
All the span-corrected dm files.
2015-06-14 22:08:14 +02:00
mwerezak
dec1461f6c
Fixes chair preview icon
2015-06-14 14:55:04 -04:00
GinjaNinja32
d31cf8f3d8
Merge pull request #9786 from LightningIron/dev-freeze
...
Welding tool bugfixes
2015-06-11 09:42:21 +01:00
