Anewbe
facd055d07
Merge pull request #3037 from VOREStation/traybuckle
...
Fix two extra robust bugs
2017-03-03 18:23:25 -06:00
Arokha Sieyes
3a8051b142
Merge pull request #1073 from VOREStation/aro-traybuckle
...
Fix two extra robust bugs
2017-03-03 16:43:36 -05:00
Arokha Sieyes
f7c22dc54d
Fix two extra robust bugs
...
Trays have no attack cooldown because they have this crazy-long snowflake code for attacks.
Beds (and children like chairs) don't track target for grab-buckle do_after, letting them run away and get teleported back to the chair and buckled regardless of their efforts.
2017-03-03 16:25:53 -05:00
Arokha Sieyes
c4b25d6cf6
Fix two extra robust bugs
...
Trays have no attack cooldown because they have this crazy-long snowflake code for attacks.
Beds (and children like chairs) don't track target for grab-buckle do_after, letting them run away and get teleported back to the chair and buckled regardless of their efforts.
2017-03-03 16:25:13 -05:00
Neerti
0f781e36a7
Adds Multi-Z Test Map
2017-03-03 09:40:34 -05:00
Arokha Sieyes
387f429e5e
Merge large polaris changes
2017-03-02 22:44:17 -05:00
Anewbe
25b925f04c
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into boots
...
# Conflicts:
# maps/northern_star/polaris-1.dmm
# maps/northern_star/polaris-2.dmm
2017-03-02 16:53:29 -06:00
Anewbe
e93fbddd7f
Merge pull request #3025 from VOREStation/toilet
...
Toilet fixes
2017-02-28 19:14:11 -06:00
Arokha Sieyes
bd844c0e16
Toilet fixes
...
Yes yes. I know.
Anyway, there's no cooldown on this so you can give someone about 800 brute in 10 seconds. A LITTLE UNUSUAL if you ask me. Also reduced it from 8 because what the hell is that toilet seat made out of? Osmium? For an armor-ignoring attack that's a little high. Also the swirlie thing was coded wrong for the do_after.
2017-02-28 01:52:57 -05:00
Anewbe
2de037fbbf
Ports a bunch of fluff stuff
2017-02-21 13:50:14 -06:00
Arokha Sieyes
cb54ebb001
Merge pull request #945 from Screemonster/tamperbugfix
...
bugfix in anti-tamper proc & screesuit
2017-02-14 19:17:56 -05:00
Screemonster
ce28b35275
Adds Krak-B-Gone, a silicate spray for fixing windows
2017-02-14 18:29:55 +00:00
Screemonster
a7ae4fd4ab
bugfix in anti-tamper proc
2017-02-13 01:42:33 +00:00
Neerti
1d9e7c8c08
works on planet stuff
2017-02-06 20:45:21 -05:00
Anewbe
7417bef794
Boots are now a subtype of shoes
2017-02-05 16:17:41 -06:00
killer653
3f1e5c80f2
Polaris sync
2017-02-01 15:08:45 -05:00
Anewbe
db41b99d17
Adds locker contents for HoS/Warden and a medical sunglasses for CMO
2017-01-27 00:26:52 -06:00
Dhaeleena
b69dad32fb
Forgot about this
2017-01-26 22:20:45 -03:00
Dhaeleena
d25f512e10
Small fix, Weird line that shouldnt be there is gone now.
2017-01-26 14:06:31 -03:00
Dhaeleena
2fef35d980
Lots of changes and Fluff fixes
2017-01-26 11:48:22 -03:00
Arokha Sieyes
d70d85220a
Adds hypo for CMO and adds vials in chem for them to use
2017-01-24 01:47:57 -05:00
Anewbe
fda82d4b17
Hood tweaks
2017-01-18 17:02:01 -06:00
Dhaeleena
b81c59989b
Fixes all around the map. Edited the security Storage lightly, gave the warden a new desk to hand out stuff. Security Vendor now has Police tape, peper spray, Tasers and stun revolvers. Added Shutters to the Public Gateway acces. Lots of tiny fixes and edits all over the place.
2017-01-18 07:53:20 -03:00
Anewbe
d53cfc4773
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins
...
# Conflicts:
# code/modules/mob/new_player/sprite_accessories.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
# icons/mob/human_face.dmi
# icons/mob/suit.dmi
2017-01-17 22:05:38 -06:00
Anewbe
0286be65ff
Ports Bay's custodial bag tweaks
2017-01-14 23:44:16 -06:00
Anewbe
2c86a0a465
Returns the Vox, who now breath Phoron
2017-01-06 17:49:39 -06:00
killer653
0c73b9da2e
Polaris December Sync
2016-12-10 09:51:11 -05:00
Anewbe
e8e0ab8762
Fixes two items not spawning properly, moves CE welder to locker
2016-11-23 16:13:55 -06:00
Nerezza
d522f6d931
Inflatable QoL tweaks
...
Features:
- Ctrl-click can deflate inflatables now.
- Using inflatables on adjacent tiles deploys them to that tile. Currently this doesn't care about objects in the way, ie computers or welding tanks, but it does respect glass and imo it works fine this way.
Bugfix:
- Bumping an inflatable door no longer freezes it closed for a few moments.
2016-11-22 01:13:29 -06:00
Nerezza
867e1cee13
Updates for Yosh's work
...
Robot/dron tesnsions escalated!
2016-11-20 16:56:12 -06:00
Nerezza
95dc6af3ad
Merged master into doortweaks
2016-11-20 16:51:56 -06:00
Nerezza
812d1b1df4
Filters the lesser borgs
...
You now have to be a greater borg (or the god-emperor of borgs) to rename airlock assemblies.
2016-11-20 16:47:52 -06:00
Yoshax
2c6d023fc7
Changes an attack_ai to attack_robot
2016-11-20 18:04:09 +00:00
Nerezza
df5906dc6b
Misc windoor/airlock fixes
...
This started as me making robots able to rename windoors and turned into something a little more.
2016-11-19 21:43:46 -06:00
Yoshax
98c1bcb614
Allows borgs to use toggle lock on closets/crates
2016-11-20 01:39:50 +00:00
Anewbe
da90b87802
Ports Bay's tape recorders
2016-11-11 00:10:55 -06:00
Arokha Sieyes
d100c30821
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync
...
# Conflicts:
# html/changelogs/.all_changelog.yml
# icons/mob/hud.dmi
# maps/polaris-1.dmm
Fake conflicts from a merge error previously. No real conflicts.
2016-11-04 15:42:32 -04:00
PsiOmegaDelta
65b12a10f2
Adds subtype friendly method to populate crates.
2016-10-25 21:40:28 +01:00
Arokha Sieyes
92833e335c
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
...
COMMENT FROM ARO: I have no idea why these files conflicted. I took the versions at their most recent commit for almost all of them (except the ones with actual merge conflict issues). Almost all the files were identical, including whitespace. Hopefully 'using theirs' will resolve this.
# Conflicts:
# code/datums/uplink/ammunition.dm
# code/game/gamemodes/technomancer/spells/aura/fire_aura.dm
# code/game/gamemodes/technomancer/spells/aura/frost_aura.dm
# code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
# code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
# code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
# code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
# code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm
# code/game/gamemodes/technomancer/spells/projectile/overload.dm
# code/game/gamemodes/technomancer/spells/projectile/projectile.dm
# code/game/jobs/job/captain.dm
# code/game/jobs/job/science.dm
# code/game/machinery/recharger.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/flashlight.dm
# code/game/objects/items/weapons/power_cells.dm
# code/game/objects/items/weapons/stunbaton.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/client/preference_setup/loadout/loadout_shoes.dm
# code/modules/client/preference_setup/loadout/loadout_uniform.dm
# code/modules/client/preference_setup/loadout/loadout_xeno.dm
# code/modules/clothing/spacesuits/void/station.dm
# code/modules/integrated_electronics/assemblies.dm
# code/modules/integrated_electronics/input_output.dm
# code/modules/integrated_electronics/tools.dm
# code/modules/mob/living/carbon/carbon_defense.dm
# code/modules/mob/living/carbon/human/examine.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/organs/blood.dm
# code/modules/paperwork/faxmachine.dm
# code/modules/projectiles/dnalocking.dm
# code/modules/projectiles/effects.dm
# code/modules/projectiles/guns/energy.dm
# code/modules/projectiles/guns/energy/laser.dm
# code/modules/projectiles/guns/energy/nuclear.dm
# code/modules/projectiles/projectile/bullets.dm
# code/modules/research/designs.dm
# html/changelogs/.all_changelog.yml
# html/changelogs/Anewbe - Beret.yml
# html/changelogs/Anewbe - Tape Roll.yml
# html/changelogs/MagmaRam-PR-2631.yml
# html/changelogs/Redstryker - EMTVoidsuits.yml
# icons/mob/head.dmi
# icons/mob/items/lefthand_hats.dmi
# icons/mob/items/lefthand_suits.dmi
# icons/mob/items/righthand_hats.dmi
# icons/mob/items/righthand_suits.dmi
# icons/mob/species/seromi/head.dmi
# icons/mob/species/seromi/suit.dmi
# icons/mob/species/skrell/helmet.dmi
# icons/mob/species/skrell/suit.dmi
# icons/mob/species/tajaran/helmet.dmi
# icons/mob/species/tajaran/suit.dmi
# icons/mob/species/unathi/helmet.dmi
# icons/mob/species/unathi/suit.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/hats.dmi
# icons/obj/clothing/species/seromi/hats.dmi
# icons/obj/clothing/species/seromi/suits.dmi
# icons/obj/clothing/species/skrell/hats.dmi
# icons/obj/clothing/species/skrell/suits.dmi
# icons/obj/clothing/species/tajaran/hats.dmi
# icons/obj/clothing/species/tajaran/suits.dmi
# icons/obj/clothing/species/unathi/hats.dmi
# icons/obj/clothing/species/unathi/suits.dmi
# icons/obj/clothing/suits.dmi
# icons/obj/power.dmi
# maps/RandomZLevels/stationCollision.dm
# maps/polaris-1.dmm
# maps/polaris-2.dmm
2016-10-20 21:24:07 -04:00
Anewbe
510cf17723
Waistcoats are accessories
2016-10-19 22:29:22 -05:00
Eearslya Sleiarion
868413c880
Polaris Sync October 9th ( #633 )
2016-10-09 18:55:29 -04:00
Anewbe
771d8b9e4b
Adds a smaller device cell for use in non-weapon devices
2016-10-08 15:34:18 -05:00
Anewbe
673e75832a
Merge pull request #2602 from SpadesNeil/death-to-the-administrator
...
Replaces Station Administrator with Colony Director, NASA Approved
2016-10-06 22:31:14 -05:00
Spades
2330968176
Replaces Station Administrator
2016-10-06 22:38:02 -04:00
Anewbe
0f51fda83a
Energy weapons can be reloaded
2016-10-06 21:30:52 -05:00
Anewbe
3bcd420e87
Fixes lattice issue
2016-10-04 19:32:40 -05:00
redstryker
2839d26e19
Multitude of Halloween Stuffs
2016-10-01 20:33:11 -04:00
Neerti
35896acee9
Merge pull request #2545 from Anewbe/cargo
...
Fixes #2536
2016-09-26 11:52:02 -04:00
Anewbe
623ad86511
Fixes cargo exploit
2016-09-25 19:59:47 -05:00
PsiOmegaDelta
c7aa3cc48a
Clears the appearance flag for multi-tile objects.
2016-09-25 19:40:11 +02:00
