d59f0f1dc4
Merge pull request #3152 from VOREStation/aro-pol-bodymarks
...
Adds Body Markings
2017-03-30 20:13:15 -05:00
19a9a8a413
Merge pull request #3172 from Anewbe/jumper_cables
...
Adds in Jumper Cables for FBP reviving
2017-03-30 19:46:26 -05:00
850155bfb7
Merge pull request #3167 from Anewbe/cigarette_sprites
...
Cigarettes and cigars have a "Burnt but not done" sprite
2017-03-30 19:37:27 -05:00
6328f1262f
Adds in Jumper Cables for FBP reviving
2017-03-29 12:43:38 -05:00
1d09caa08d
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into engineering_sprites
2017-03-29 06:24:06 +01:00
55fd0a2041
Adds hand sprites to many items in the engineering department
2017-03-29 04:09:33 +01:00
f91431fefa
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cigarette_sprites
2017-03-28 20:36:48 -05:00
826b7c5af0
Fixes a thing
2017-03-28 20:17:35 -05:00
2f976a22f8
Merge pull request #3158 from Anewbe/fbp_screams
...
FBPs should no longer scream when they collapse
2017-03-28 20:03:01 -05:00
9ff0180315
Merge pull request #3138 from Anewbe/radio_freqs
...
Antag Radio changes
2017-03-28 20:02:44 -05:00
33dffeb0b8
Merge pull request #2955 from Anewbe/heart_damage
...
Big Ol' Medical Tweaks
2017-03-28 20:02:24 -05:00
c7e224b6e2
Merge pull request #3075 from Anewbe/armor_soak
...
Implements Armor Soak
2017-03-28 20:02:00 -05:00
6a2d0826cb
Merge pull request #3126 from Anewbe/box_cutter
...
Adds Boxcutters
2017-03-28 19:59:09 -05:00
ff78d25ca1
Merge pull request #3160 from Anewbe/robo_climb
...
Borgs can climb
2017-03-28 19:57:19 -05:00
add4607d98
Merge pull request #3159 from Anewbe/electric_welder
...
Adds the electric welder
2017-03-28 19:56:43 -05:00
dc58616dc8
Merge pull request #3153 from Yoshax/iconsplitting
...
'Improved' solution to the full uniform.dmi problem
2017-03-28 18:22:04 -05:00
cddbc6e976
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into radio_freqs
2017-03-28 14:28:15 -05:00
2253838114
Merge pull request #3163 from VOREStation/shuttlebetter
...
Shuttle system tweaks
2017-03-28 14:00:16 -05:00
77a73a898a
Shuttle system tweaks
...
Fixes one line of code and touches up cryo shuttle look
2017-03-28 11:59:36 -04:00
7e279ebd03
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into electric_welder
...
# Conflicts:
# icons/mob/items/lefthand.dmi
# icons/mob/items/righthand.dmi
2017-03-28 00:17:28 -05:00
b5696a9c6f
Merge pull request #3155 from Schnayy/flower_crowns2
...
Flower crowns with fixed conflict? Maybe? Please?
2017-03-27 23:32:47 -05:00
6e7aa75835
Merge pull request #3141 from VOREStation/shuttlebetter
...
Dynamic Shuttle Walls/Landings
2017-03-27 23:26:35 -05:00
77886b648c
Fixes a travis issue
2017-03-27 23:22:36 -05:00
b1620cfa20
Borgs can climb
2017-03-27 23:15:13 -05:00
d66e1beca0
Adds the electric welder
2017-03-27 22:43:20 -05:00
73ab115295
Fixes a thing.
2017-03-27 22:32:02 -05:00
e4ca4707d1
Fixed code at Neerti's request, fixed a small sprite error where crowns appeared in the wrong hand.
2017-03-27 21:24:47 -05:00
0f98eedab4
Fixed indentation
2017-03-27 17:16:06 -05:00
971eb97399
Fixed conflict? Maybe? Please?
2017-03-27 00:42:39 -05:00
ba7cad162d
Revert "Makes space in the uniforms.dmi file"
...
This reverts commit 6b0500dd27
2017-03-27 03:34:12 +01:00
52130160db
Adds Body Markings
...
So you can customize your character with tattoos or fur colors for Taj or whatever. I'll let Anewbe work out what he wants to whitelist other than what I did already.
The icons are sliced up with the HumanScissors program I wrote, so they are per-organ. So, lop off a limb, put it on someone else, they have the tattoos and whatnot. It's part of DNA so it comes with when cloning.
They are defined in the normal sprite_accessories file and the icons are all in markings.dm in the format of "markingname-organtag" so if you have a marking that spans both arms and torso you need "thatone-torso", "thatone-l_arm", "thatone-r_arm" icon states.
2017-03-26 19:36:34 -04:00
431dd1d290
Adds taking drags from smokables
2017-03-26 18:07:35 -05:00
565fea9648
Merge pull request #3144 from Anewbe/uniforms
...
Makes space in the uniforms.dmi file
2017-03-26 18:14:06 -04:00
9fedcf7d1e
Merge pull request #3145 from Cerebulon/medical_handsprites
...
Added hand sprites to most medical items.
2017-03-26 17:06:10 -05:00
6472f02040
Removed unnecessary icon_state code. Added basic scanner sprite.
2017-03-26 22:00:09 +01: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
1300ef333d
Dynamic Shuttles - Code and Icon Changes
2017-03-25 21:00:08 -04:00
6cd424b2e1
Fixes the antag age blocker
2017-03-25 16:36:17 -05:00
88b0c6086e
Antag Radio changes
2017-03-25 14:19:57 -05:00
90df4dbd34
Merge pull request #3130 from Anewbe/clone_memory_disorder
...
Adds text for CMD to the cloning message
2017-03-25 11:26:17 -04: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
19231a9e5b
Adds text for CMD to the cloning message
2017-03-24 15:21:47 -05:00
2a4948e931
Merge pull request #3128 from Cerebulon/missing_hand_sprites
...
Adds in-hand sprites to several items.
2017-03-24 14:51:00 -05:00
38571fb8bc
Adds in-hand sprites to several items.
...
Hand labeller, light replacer, megaphone, binoculars, powersink, suit cooler and lantern.
2017-03-23 22:03:17 +00:00
a80ea977d1
Adds Boxcutters
2017-03-23 15:27:48 -05:00
32437f2418
Fix mob.loc = X on spawn
...
* When spawning into the game (both latejoin and normal join) the job controller used loc = X to set location. This meant that Enter() was never called for entering the spawn location, and all other associated problems.
* This screws up the new jukebox music system because mob.lastarea is not set correctly.
* Fixed signpost teleporting for the same reason (nobody wants beach tunes playing forever)
2017-03-22 23:05:44 -04:00
e3a87c1c78
Merge pull request #2985 from Anewbe/more_pdas
...
Adds rugged style PDAs
2017-03-22 19:42:19 -05:00
d603394226
Merge pull request #3121 from Anewbe/borg_zap
...
Borg stun arm should work now
2017-03-22 19:42:01 -05:00
2c9c3e208e
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2
...
# Conflicts:
# code/modules/mob/living/simple_animal/hostile/giant_spider.dm
# code/modules/organs/blood.dm
# code/modules/organs/internal/lungs.dm
# code/modules/organs/organ.dm
# code/modules/organs/organ_external.dm
2017-03-22 17:29:01 -05:00
Anewbe