Dhaeleena
b2479bb416
Fixes Stray disposals junction on S3. Fixes missing bandanas icon state. Access fixes for xenoarch in S1. Adds grilles to mining outpost, fixes one area on that area, adds recharger. Still can fix power on that are pls halp. Fixes NT lockers wrong icon state. Fixes emergency airlocks on C6 not being locked.
2017-05-21 07:20:00 -03:00
Arokha Sieyes
1ae616fe01
Fix bluespace harpoon spawning
2017-05-20 22:26:07 -04:00
Leshana
e4becce7bf
Added VOREStation comments to our custom lines that were missing them and removed debugging code.
2017-05-20 16:57:33 -04:00
Leshana
be19a40248
Fix missing closing HTML tags in messages.
2017-05-20 16:05:54 -04:00
Leshana
acc1e9a0ba
Revert changes to structures.dmi and re-do them using structures_vr.dmi
2017-05-17 20:47:38 -04:00
Leshana
a8dbd7627d
Converts our own uses of PoolOrNew to use just new()
2017-05-16 00:26:56 -04:00
Leshana
5ae26332fa
Merge branch 'master' into aro-tether-wip
...
# Conflicts:
# code/ZAS/_docs.dm
# code/game/area/areas.dm
# code/game/objects/explosion.dm
# code/modules/holodeck/HolodeckControl.dm
# code/modules/mob/living/say.dm
2017-05-16 00:26:32 -04:00
Arokha Sieyes
d1b37bf481
Split HoS locker into two
2017-05-09 11:10:14 -04:00
Arokha Sieyes
7058806865
Ports 'head' guns from Eris, change Hunter sprite
...
RD: Bluespace Harpoon
HoS: Lamia handgun
HoP: Holdout E-Gun
A few other unused ones included in code.
2017-05-09 02:42:32 -04:00
Leshana
4fbfa7ee37
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08
...
# Conflicts:
# code/modules/mob/dead/observer/observer.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/mob_defines.dm
# html/changelogs/.all_changelog.yml
# vorestation.dme
2017-05-08 21:07:45 -04:00
Anewbe and GitHub
42fe5d9ed6
Merge pull request #3412 from VOREStation/pool-closed
...
Removes the datum pool, as it is not performant.
2017-05-08 17:21:24 -05:00
Leshana
44ff1a70c6
Removes the datum pool, as it is not performant.
...
* Creating new objects is cheap, in fact comparable to the cost of getting it out of the pool, so it doesn't help there.
* Placing items in the pool is far more expensive than letting them garbage collect due to the resetting of vars and such.
2017-05-04 01:58:33 -04:00
Leshana
31250690e5
Fixed the escape tram to actually work
...
* Made it actually work.
* Made the doors work nicely.
* Sped up the animations.
* Fixed the chairs.
2017-04-30 19:56:58 -04:00
Cerebulon
36decd20b7
Adds icons. Adds skirts to loadout options and closets.
2017-04-30 02:39:27 +01:00
Cerebulon
339b269393
Adds 23 new skirt versions of existing suit sprites.
...
Adds them to loadout options and departmental uniform lockers as appropriate.
One new (Old Woman Attire) as equivalent to old man suit.
Some are unused, but now skirt sprites exist.
2017-04-29 12:01:40 +01:00
Leshana
fc4856bba4
Committing on behalf of Dhaeleena
2017-04-28 21:48:17 -04:00
Leshana
749073b2ba
Work on tether-1 and tether-3
...
* Completed atmospherics piping on z5,6,7
* Fixed missing firelocks on 1-7
* Added preliminary cargo sort logic.
* Fixed surgery sign.
2017-04-27 23:08:41 -04:00
Arokha Sieyes
a7929544e7
Revert beds to Polaris sprites
2017-04-26 13:14:28 -04:00
Arokha Sieyes
80670b420c
Merge current master in
2017-04-25 20:14:38 -04:00
Arokha Sieyes
055c998f82
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/modules/integrated_electronics/subtypes/reagents.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/organs/organ_external.dm
# code/modules/ventcrawl/ventcrawl.dm
# html/changelogs/.all_changelog.yml
2017-04-25 15:04:54 -04:00
Anewbe and GitHub
5f9bdc5748
Merge pull request #3349 from LorenLuke/Body-Bag
...
Tweaks bodybag relaymove(). Allows exit from morgue trays while in bodybags.
2017-04-24 13:43:59 -05:00
Arokha Sieyes
041de75225
Allow chairs/beds to not get colored
2017-04-23 18:02:11 -04:00
Arokha Sieyes
e03a355fe5
Eris Chairs/Beds Sprites
2017-04-23 17:57:04 -04:00
LorenLuke
b87fb2389f
Adds morgue.dm changes.
2017-04-22 23:36:11 -07:00
OrbisAnima
20bc8aa7c7
Cargo Love: stupid outdated documentation
...
stupid me for getting cocky and not compiling beforehand, stupid sublime for being so sexy.
2017-04-21 12:20:38 -03:00
OrbisAnima
cbf945d02f
Cargo love: Reviews Corrections
2017-04-21 11:55:27 -03:00
OrbisAnima
3efabaf2ab
Added 3 new crates to cargo:
...
Recreation: - Recreational Restraints, all the kind of stuff you might need to restrain someone but still showing you care, whip included.
Science: - Dangerous Predator Crate, contains a random common predator for science analisys, a system that might come in the future!
(Contraband) Extremely Dangerous Predator Crate, Contains a random yet quite mortal predator, for analiisys only by the bravest or fooliest people in the crew.
2017-04-20 20:48:27 -03:00
Leshana and Arokha Sieyes
6058225d9b
Ported Eris signs, plus some custom directions signs.
...
* Addded a Command department directions sign.
* Added a Space Elevator directions sign.
2017-04-18 23:20:02 -04:00
Leshana and Arokha Sieyes
a6ae62b13b
Ported Eris's "railings"
...
* Railings are an ON_BORDER object that looks like a railing; you can throw and reach across it, but it stops you from falling into holes or whatever.
* Mobs can climb over them (or throw other mobs over them!)
* They are construtable/deconstructable.
* Smoothly auto-joining sprites to look like a railing.
* Changes from Eris: Converted << to to_chat(), Desnowflaked some code, Fixed being able to climb over when windows are in the way.
2017-04-18 23:19:26 -04:00
Leshana and Arokha Sieyes
ceaf03a63d
Ported Catwalks from Eris
...
* Catwalks are an upgrade to lattice; instead of just a framework of wires its a mostly solid grid walkway.
* They are semi-transparent so you can see wires/pipes below them a bit.
* Smoothly auto-joining sprites to look proper.
* Constructed by upgrading lattice; like lattice it will stop you falling if build over an open space.
* Changes from Eris: Converted << to to_chat(), fix redraw on Destroy(), Fix color macros in text.
2017-04-18 23:19:18 -04:00
Leshana
7a4dc4bf79
Merge remote-tracking branch 'polaris/master' into polaris-sync
...
# Conflicts:
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/zresearchlabs.dmm
2017-04-15 23:14:32 -05:00
Anewbe and GitHub
1fbef2de5b
Merge pull request #3286 from VOREStation/smooth-lighting
...
Port tg/paradise/goon soft-edge lighting
2017-04-15 22:52:42 -05:00
Arokha Sieyes
c93836745f
Make wingrille spawners usable
...
Makes the spawner object itself block air and prevent active edges before the game starts, so you can actually use these in maps now without creating tons of active edge warnings and making ZAS zones merge everywhere. Should save a loooot of time for mappers picking those window directions.
2017-04-14 21:35:49 -04:00
Leshana
45058136e2
Replace opacity = X with set_opacity(X) so that the lighting system can update propertly.
2017-04-11 22:36:48 -04:00
Arokha Sieyes
e7d8af7ae7
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/modules/client/preference_setup/loadout/loadout_xeno.dm
# code/modules/mob/mob.dm
# html/changelogs/.all_changelog.yml
2017-04-10 20:41:18 -04:00
Anewbe
e9c4b5a3eb
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
...
# Conflicts:
# icons/mob/back.dmi
# icons/mob/items/lefthand.dmi
# icons/mob/items/righthand.dmi
2017-04-07 16:11:50 -05:00
Arokha Sieyes
85a489b9b6
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
2017-04-04 20:25:00 -04:00
Anewbe and GitHub
6a95f6c87f
Merge branch 'master' into apron_pockets
2017-04-04 17:54:38 -05:00
Belsima and GitHub
3109cae86e
I missed a B.
2017-04-02 12:07:54 -04:00
Belsima and GitHub
5efb8bf05d
Makes mopbucket climbable.
2017-04-02 11:42:13 -04:00
Belsima and GitHub
64a1dc7f6d
Makes janicart climable.
2017-04-02 11:41:06 -04:00
Anewbe
8e9db2b7d4
Aprons now have pockets
2017-04-02 00:28:20 -05:00
Leshana
6eee55c983
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
...
# Conflicts:
# code/modules/client/preference_setup/general/03_body.dm
# code/modules/mob/new_player/sprite_accessories.dm
# html/changelogs/.all_changelog.yml
# icons/mob/human_races/markings.dmi
# vorestation.dme
2017-04-01 19:19:42 -04:00
Anewbe
7bb3f5fbb7
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
...
# Conflicts:
# code/datums/supplypacks/medical.dm
# code/game/objects/structures/crates_lockers/closets/wardrobe.dm
# code/modules/clothing/shoes/miscellaneous.dm
# code/modules/clothing/suits/labcoat.dm
# icons/mob/back.dmi
# icons/mob/feet.dmi
# icons/mob/human_face.dmi
# icons/mob/items/lefthand.dmi
# icons/mob/items/righthand.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/shoes.dmi
# icons/obj/clothing/suits.dmi
# icons/obj/storage.dmi
# maps/northern_star/polaris-2.dmm
# maps/northern_star/polaris-5.dmm
2017-04-01 12:45:45 -05:00
MagmaRam and GitHub
c7e224b6e2
Merge pull request #3075 from Anewbe/armor_soak
...
Implements Armor Soak
2017-03-28 20:02:00 -05:00
Yoshax
ba7cad162d
Revert "Makes space in the uniforms.dmi file"
...
This reverts commit 6b0500dd27
2017-03-27 03:34:12 +01:00
Arokha Sieyes
9edf3a6629
Polaris Merge Sync
2017-03-26 20:12:34 -04:00
Neerti and GitHub
565fea9648
Merge pull request #3144 from Anewbe/uniforms
...
Makes space in the uniforms.dmi file
2017-03-26 18:14:06 -04:00
Cerebulon
3c17d1b33f
Added in-hand sprites to most item lacking them from the Medical department.
...
(Full list: Body bag, Advanced Mass Spectrometer, Rescue Suit Control Module, Stethoscope, Stasis bag, Defibrillator, Blood Packs, Advanced Trauma/Burn Kits, Hypospray, Biopsy Scanner, Surgical Drill, Fixovein, Retractor, Bone-Gel, Bone Setter, Cautery, Hemostat, Inflatable Wall Box.
2017-03-26 07:04:01 +01:00
Anewbe
6b0500dd27
Makes space in the uniforms.dmi file
2017-03-26 00:59:14 -05:00
Dhaeleena