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
6a95f6c87f
Merge branch 'master' into apron_pockets
2017-04-04 17:54:38 -05:00
3109cae86e
I missed a B.
2017-04-02 12:07:54 -04:00
5efb8bf05d
Makes mopbucket climbable.
2017-04-02 11:42:13 -04:00
64a1dc7f6d
Makes janicart climable.
2017-04-02 11:41:06 -04:00
8e9db2b7d4
Aprons now have pockets
2017-04-02 00:28:20 -05:00
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
c7e224b6e2
Merge pull request #3075 from Anewbe/armor_soak
...
Implements Armor Soak
2017-03-28 20:02:00 -05:00
ba7cad162d
Revert "Makes space in the uniforms.dmi file"
...
This reverts commit 6b0500dd27
2017-03-27 03:34:12 +01:00
565fea9648
Merge pull request #3144 from Anewbe/uniforms
...
Makes space in the uniforms.dmi file
2017-03-26 18:14:06 -04:00
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
6b0500dd27
Makes space in the uniforms.dmi file
2017-03-26 00:59:14 -05:00
3816d634ed
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into armor_soak
...
# Conflicts:
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
2017-03-24 16:35:31 -05:00
38598f3aae
Merge pull request #3118 from Neerti/3/6/2017_surface_map
...
Continues work on the surface map
2017-03-22 16:33:40 -05:00
9660186dfd
Not So Simple Animals ( #3103 )
...
* Merge two not-really conflicts
Thanks git, that whitespace conflict was super important?
* DME merge
* Added defines for mobs used by simple animals.
* Lost a slime along the way
* Disable debug settings
* HONK!!!
* Remove redundant hostile decls
* Replace loc= with forceMove in old SA code
I guess I should think of the children.
2017-03-22 14:30:07 -05:00
e1554f323b
Adds engineering + science crates ( #3072 )
...
* Adds engineering + scicrates.
* Enables the science crate
* Updates engineering crate icons.
* Inflatables don't need security.
* fixes RCD crates
2017-03-21 18:38:47 -05:00
b571ed9c66
Continues work on the surface map
2017-03-21 16:11:13 -04:00
400b0749aa
Add one inflatables kit to paramedic lockers
...
Makes sense to meeee. Hopefully it does to you, too. Gotta rescue those people!
2017-03-15 23:56:52 -04:00
ac79f548e7
Sorta implements armor soak, very WIP
2017-03-10 20:26:37 -06:00
7130d56b80
Merge pull request #3064 from Woodratt/WR_SC_Changes
...
WR_SC_Map_Changes
2017-03-08 19:58:46 -06:00
19fb047f01
WR_SC_Map_Changes
...
- Fixes sprite issues with departmental intercoms.
- Tweaks to the random objects dm
- Copies Bay's flora and warning sign list, as well as ports some of their signs.
- Addition of a couple new floor decals.
- New table preset, wooden reinforced.
2017-03-08 17:44:48 -08:00
05e6ef5ad8
Merge pull request #2988 from Anewbe/boots
...
Boots are now a subtype of shoes
2017-03-05 14:13:47 -06:00
283071d9db
Merge pull request #3035 from Neerti/3/2/2017_example_map
...
Adds Multi-Z Test Map
2017-03-04 15:26:49 -06:00
facd055d07
Merge pull request #3037 from VOREStation/traybuckle
...
Fix two extra robust bugs
2017-03-03 18:23:25 -06:00
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
0f781e36a7
Adds Multi-Z Test Map
2017-03-03 09:40:34 -05:00
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
e93fbddd7f
Merge pull request #3025 from VOREStation/toilet
...
Toilet fixes
2017-02-28 19:14:11 -06:00
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
2de037fbbf
Ports a bunch of fluff stuff
2017-02-21 13:50:14 -06:00
1d9e7c8c08
works on planet stuff
2017-02-06 20:45:21 -05:00
7417bef794
Boots are now a subtype of shoes
2017-02-05 16:17:41 -06:00
db41b99d17
Adds locker contents for HoS/Warden and a medical sunglasses for CMO
2017-01-27 00:26:52 -06:00
fda82d4b17
Hood tweaks
2017-01-18 17:02:01 -06:00
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
0286be65ff
Ports Bay's custodial bag tweaks
2017-01-14 23:44:16 -06:00
2c86a0a465
Returns the Vox, who now breath Phoron
2017-01-06 17:49:39 -06:00
e8e0ab8762
Fixes two items not spawning properly, moves CE welder to locker
2016-11-23 16:13:55 -06:00
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
867e1cee13
Updates for Yosh's work
...
Robot/dron tesnsions escalated!
2016-11-20 16:56:12 -06:00
95dc6af3ad
Merged master into doortweaks
2016-11-20 16:51:56 -06:00
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
2c6d023fc7
Changes an attack_ai to attack_robot
2016-11-20 18:04:09 +00:00
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
98c1bcb614
Allows borgs to use toggle lock on closets/crates
2016-11-20 01:39:50 +00:00
da90b87802
Ports Bay's tape recorders
2016-11-11 00:10:55 -06:00
65b12a10f2
Adds subtype friendly method to populate crates.
2016-10-25 21:40:28 +01:00
510cf17723
Waistcoats are accessories
2016-10-19 22:29:22 -05:00
771d8b9e4b
Adds a smaller device cell for use in non-weapon devices
2016-10-08 15:34:18 -05:00
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
Anewbe