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
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
9edf3a6629
Polaris Merge Sync
2017-03-26 20:12:34 -04: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
f93141d7d3
Merge remote-tracking branch 'polaris/master'
...
# Conflicts:
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# vorestation.dme
2017-03-22 20:08:29 -04:00
f0270451a7
Added vore capabilies to the new simple_animal system.
...
* Added happy friend time mechanics working properly for fox and cat.
* Added vore mechanics and vore overrides
* No longer enable vore on simple animals by creating a "/vore" subtype. Instead we simply enable vore on the main type. Consensus being we don't need a type for non-vore versions of stuff.
* This allowed us to revert many path references throughout the codebase to the original non-vorestation back to their original values. In these cases the "Vorestation Edit" comment is removed.
* Moved the vore overrides for upstream simple animals into its own file zz_vore_overrides.dm
2017-03-22 19:32:19 -04:00
88b5756977
Arokha SA Rework (Polaris)
2017-03-22 19:32:19 -04: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
805b473976
Polaris Sync Merge
...
Fixed Polaris merge conflicts
* Space controller merge conflict
2017-03-18 00:58:12 -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
4c0e330140
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-polsync
2017-03-11 18:47:17 -05: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
f53dfde515
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06
...
# Conflicts:
# code/game/objects/items/blueprints.dm
# vorestation.dme
2017-03-06 20:58:38 -05: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
3a8051b142
Merge pull request #1073 from VOREStation/aro-traybuckle
...
Fix two extra robust bugs
2017-03-03 16:43:36 -05: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
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
0f781e36a7
Adds Multi-Z Test Map
2017-03-03 09:40:34 -05:00
387f429e5e
Merge large polaris changes
2017-03-02 22:44:17 -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
cb54ebb001
Merge pull request #945 from Screemonster/tamperbugfix
...
bugfix in anti-tamper proc & screesuit
2017-02-14 19:17:56 -05:00
ce28b35275
Adds Krak-B-Gone, a silicate spray for fixing windows
2017-02-14 18:29:55 +00:00
a7ae4fd4ab
bugfix in anti-tamper proc
2017-02-13 01:42:33 +00: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
3f1e5c80f2
Polaris sync
2017-02-01 15:08:45 -05:00
db41b99d17
Adds locker contents for HoS/Warden and a medical sunglasses for CMO
2017-01-27 00:26:52 -06:00
b69dad32fb
Forgot about this
2017-01-26 22:20:45 -03:00
d25f512e10
Small fix, Weird line that shouldnt be there is gone now.
2017-01-26 14:06:31 -03:00
2fef35d980
Lots of changes and Fluff fixes
2017-01-26 11:48:22 -03:00
d70d85220a
Adds hypo for CMO and adds vials in chem for them to use
2017-01-24 01:47:57 -05:00
fda82d4b17
Hood tweaks
2017-01-18 17:02:01 -06:00
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
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
0c73b9da2e
Polaris December Sync
2016-12-10 09:51:11 -05:00
Leshana