MagmaRam
4e43960fcf
Merge pull request #3177 from Anewbe/doona_organs
...
Diona limbs should be easier to remove
2017-03-30 20:53:45 -05:00
Anewbe
cf9e3f8789
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into overdose_boogaloo
2017-03-30 20:51:13 -05:00
MagmaRam
34e398d328
Merge pull request #3175 from Anewbe/hands_things
...
Device Cell QOL
2017-03-30 20:49:24 -05:00
Leshana
379ac4c63d
Fix Runtimes
...
click.dm fixes:
[09:46:49] Runtime in unsorted.dm,1293: list index out of bounds
proc name: screen loc2turf (/proc/screen_loc2turf)
[09:46:49] Runtime in click.dm,345: Cannot execute null.Click().
proc name: Click (/obj/screen/click_catcher/Click)
paper_bundle.dm fixes:
[10:30:21] Runtime in paper_bundle.dm,183: Cannot read null.loc
proc name: Topic (/obj/item/weapon/paper_bundle/Topic)
human.dm fixes:
12:27:51] Runtime in human.dm,1476: Cannot read null.name
proc name: Toggle Underwear (/mob/living/carbon/human/verb/toggle_underwear)
2017-03-30 21:20:31 -04:00
Anewbe
d59f0f1dc4
Merge pull request #3152 from VOREStation/aro-pol-bodymarks
...
Adds Body Markings
2017-03-30 20:13:15 -05:00
Anewbe
2867f17b51
Merge pull request #3162 from Schnayy/department_jackets
...
Adds Department Color Jackets
2017-03-30 20:11:39 -05:00
Anewbe
f7d086fa59
Overdose is more dangerous, Bicaridine works again
2017-03-30 20:09:21 -05:00
MagmaRam
19a9a8a413
Merge pull request #3172 from Anewbe/jumper_cables
...
Adds in Jumper Cables for FBP reviving
2017-03-30 19:46:26 -05:00
MagmaRam
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
Leshana
c6d9f019d0
Prevent infinate steel generation by limiting pipe recycling, and not starting with steel.
2017-03-30 20:37:25 -04:00
Arokha Sieyes
c828a85f06
Adds Body Markings - VOREStation Species
...
Vulps! And removes whitelist for parts.
2017-03-30 18:57:48 -04:00
Leshana
ab4c63791a
Modernize the automatic pipe layer
...
* Upgrades the automatic pipe layer to modernize its code a bit towards latest standards and fixing various bugs.
* Make it constructable so it can acutally be used by someone!
2017-03-30 18:13:37 -04:00
Arokha Sieyes
e116f08d24
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-30 18:05:20 -04:00
Cerebulon
2189d83812
Fixed single leftover 'cybernetic' and 'drone' variables.
2017-03-30 21:50:04 +01:00
Anewbe
9a9849d56c
Merge pull request #3179 from VOREStation/vplk-fish
...
Added a few fish as simple animals
2017-03-30 15:37:46 -05:00
Anewbe
dc12d9b42f
Merge pull request #3171 from Cerebulon/engineer_hand_sprites
...
Adds hand sprites to many engineering items
2017-03-30 14:27:45 -05:00
Arokha Sieyes
339806fcc2
Merge pull request #1288 from VOREStation/aro-licklimit
...
Add cooldowns to licking and dogborgs
2017-03-30 14:51:00 -04:00
Arokha Sieyes
a8ebc54170
One-click mouse scooping and edibility
...
Makes mice scoopable with one click, and can be ate rather than needing to be grabbed.
Resolves #1255
2017-03-30 14:07:30 -04:00
Leshana
b562941377
Added a few fish as simple animals
...
* They are simple non-hostile simple_animal's that wander around a bit.
* Wandering code is overriden so they will not leave the water. And they will take damage as an unsuitable atmosphere if they do.
* Fish sprites improved and animated by Kligor
2017-03-30 13:09:11 -04:00
Cerebulon
9e955cf999
Missed a spot.
2017-03-30 18:04:21 +01:00
Cerebulon
7773ef7122
Dialled back changes to only effect menu display text for brains.
...
Reverted variable names to original assisted/mechanical/digital to prevent potential issues in other code which may rely on them.
2017-03-30 18:01:20 +01:00
Arokha Sieyes
ea52a15c90
Add cooldowns to licking and dogborgs
...
They didn't have one, now it's the default attack click cooldown time.
Resolves #1266
2017-03-30 12:52:53 -04:00
Yoshax
fb7da48588
Fixes an issue with smes deconstruction
2017-03-30 16:42:11 +01:00
Arokha Sieyes
a28c9eacb2
Drop some custom items
2017-03-29 23:40:02 -04:00
Arokha Sieyes
e38701ddb1
leg holster
2017-03-29 23:37:19 -04:00
Arokha Sieyes
1651700be0
Merge pull request #1283 from VOREStation/aro-boots
...
Lets you put people in shoes again
2017-03-29 18:40:57 -04:00
Cameron653
2bba9d29dc
Merge pull request #1282 from VOREStation/aro-squish
...
Copypaste error on *squish
2017-03-29 16:32:06 -04:00
Anewbe
caea997f7d
Diona limbs should be easier to remove
2017-03-29 14:58:12 -05:00
Arokha Sieyes
660d14f72b
Lets you put people in shoes again
...
Same ol same ol. Max 2 per customer.
2017-03-29 15:08:17 -04:00
Schnayy
a5384dab83
Fixed in-hand sprites, made adjustment to open icon.
2017-03-29 14:00:57 -05:00
Anewbe
c9bfabd426
Device Cell QOL
2017-03-29 13:58:35 -05:00
Anewbe
e9ad3eba3a
Merge pull request #3174 from VOREStation/aro-pol-squish
...
Copypaste error on *squish
2017-03-29 13:25:12 -05:00
Arokha Sieyes
a66eba807f
Copypaste error on *squish
...
Whups!
2017-03-29 14:16:16 -04:00
Arokha Sieyes
83a782a3de
Copypaste error on *squish
...
Whups!
2017-03-29 14:15:07 -04:00
Anewbe
6328f1262f
Adds in Jumper Cables for FBP reviving
2017-03-29 12:43:38 -05:00
Arokha Sieyes
c0f66f2ccb
Merge pull request #1281 from VOREStation/aro-cag
...
Adds 500 Cards against The Galaxy cards
2017-03-29 13:28:22 -04:00
Arokha Sieyes
56cfe66a18
Adds 500 Cards against The Galaxy cards
...
So now it's more of a playable game
2017-03-29 12:52:20 -04:00
OrbisAnima
43462dd1c4
Add Slug Tail sprite by @Natje0
...
Solves #1243
2017-03-29 09:32:21 -03:00
Cerebulon
1d09caa08d
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into engineering_sprites
2017-03-29 06:24:06 +01:00
Cerebulon
365f92101d
Reverted botched changes.
2017-03-29 05:49:44 +01:00
Cerebulon
55fd0a2041
Adds hand sprites to many items in the engineering department
2017-03-29 04:09:33 +01:00
MagmaRam
d98745d9d3
Merge pull request #3169 from Anewbe/italics_switch
...
Italics switch from / to | characters
2017-03-28 21:54:23 -05:00
Arokha Sieyes
13da60a829
Merge pull request #1274 from VOREStation/fix-media-oops
...
Oops. Accidently did mediamanager shutdown wrong. Fixed.
2017-03-28 22:39:29 -04:00
Arokha Sieyes
b196708ed5
Merge pull request #1276 from Yoshax/fbp
...
Fixes the color application on Vey-Med prosthetics
2017-03-28 22:39:04 -04:00
Arokha Sieyes
b3e602569f
Merge pull request #1275 from Cameron653/master
...
BatterBatter! (Repost)
2017-03-28 22:37:59 -04:00
Anewbe
cdf69e0eec
Italics switch from / to | characters
2017-03-28 21:13:46 -05:00
Cerebulon
d5a9e15f28
Fixed get_FBP_type() method for determining min/max ages to use new type names.
2017-03-29 03:07:52 +01:00
MagmaRam
a3c83ac025
Robots, cyborgs, etc can now use grinders in the kitchen and chemlab
2017-03-28 20:47:38 -05:00
Anewbe
f91431fefa
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cigarette_sprites
2017-03-28 20:36:48 -05:00
Anewbe
7ae8d934f5
Should fix a Travis issue
2017-03-28 20:24:17 -05:00
