Commit Graph

14067 Commits

Author SHA1 Message Date
Cameron653
3b56e836c9 Makes Xenoarch Great Again 2016-05-18 17:28:18 -04:00
Cameron653
1793b9b318 Makes xenoarch pretty again. 2016-05-18 17:19:15 -04:00
Cameron653
714273cd83 Github desktop client removed this for some reason? 2016-05-18 15:20:52 -04:00
Cameron653
e985f859dc Allows all the races to use all the hair styles.
With the exception of species specific hair styles.
Also lets species be bald if they want to be.
Reorganizes the ears, making colorable ones come last
Also adds in both Zorren ears
2016-05-18 15:20:31 -04:00
Cameron653
360913ee80 Fixes a bug that made hair colored tails not show
Also makes it more consistent. Instead of having "hair colored" and
"colorable", it's all "colorable"
2016-05-18 14:25:09 -04:00
Arokha Sieyes
4c38d6a147 Merge pull request #104 from VOREStation/sync
Polaris Sync 05-18-2016
2016-05-18 13:29:34 -04:00
Arokha Sieyes
d75766796a Merge pull request #105 from VOREStation/fix-human-ears
Fix humans always having ears in character preview.
2016-05-18 12:49:18 -04:00
Leshana
6663c4c6fb Fix humans always having ears in character preview. 2016-05-18 12:40:52 -04:00
Arokha Sieyes
7914c9d943 Merge branch 'master' of https://github.com/VOREStation/Polaris into sync 2016-05-18 10:13:26 -04:00
Arokha Sieyes
3cd660d79d Fixes synths and sets null post-load prefs
Fixes digestion button missing, and synths overheating in a belly, and synth custom species
2016-05-18 01:36:14 -04:00
Arokha Sieyes
33145046a0 Fixes examine text casing. 2016-05-18 01:25:42 -04:00
Arokha Sieyes
769cb0d32f Makes robolimbs repair completely
Previously, because noncritical robolimbs did not count for bruteloss or burnloss (per line 13 in human_damage.dm), nothing would ever cause robot limbs to call update_wounds() on the organs to clear wounds after repair. Furthermore, update_wounds ignored wounds on robotic limbs and edited early without even checking if it should remove them. This caused a problem.

This corrects this, and still exits early(er) in update_wounds() for robotic limbs, but makes sure there are no 0-damage wounds left and if there are, removes them.

As a 'backup', hitting a robolimb with a welder when there's nothing to fix will also call this proc, to catch any cases where someone has directly changed wounds or anything like that.

Also fixes spacing on robolimb damage examine text (get_wound_desc had spaces, but should not have in most cases), and added a message for having an open maintenance panel on a limb.
2016-05-18 01:25:34 -04:00
Arokha Sieyes
0294c858da Fixes examine text casing. 2016-05-18 01:23:36 -04:00
Arokha Sieyes
1749af51b2 Makes robolimbs repair completely
Previously, because noncritical robolimbs did not count for bruteloss or burnloss (per line 13 in human_damage.dm), nothing would ever cause robot limbs to call update_wounds() on the organs to clear wounds after repair. Furthermore, update_wounds ignored wounds on robotic limbs and edited early without even checking if it should remove them. This caused a problem.

This corrects this, and still exits early(er) in update_wounds() for robotic limbs, but makes sure there are no 0-damage wounds left and if there are, removes them.

As a 'backup', hitting a robolimb with a welder when there's nothing to fix will also call this proc, to catch any cases where someone has directly changed wounds or anything like that.

Also fixes spacing on robolimb damage examine text (get_wound_desc had spaces, but should not have in most cases), and added a message for having an open maintenance panel on a limb.
2016-05-18 01:14:41 -04:00
Leshana
c8289fd465 Fixes colorable custom accessories not being colorable. (#97)
* Previous attempt to make sprite_accessories datums configurable as to whether they should be blended by ICON_ADD vs. ICON_MULTIPLY failed because ICON_ADD's value is actually zero.  do_coloration was also checked to see if the sprite should be colorized at all.
* Thus a datum configured to use ICON_ADD (zero) didn't get colored at all!
* Fix separates the concept of "do/don't colorize" from  "blend mode to use when colorizing"
2016-05-17 22:43:49 -04:00
Leshana
4076d9491c A fix to Issue #30 - Repeated Nomming (#99)
* This fixes vore mobs eating you four times due to the enhanced process scheduler we have now.
* Also fixes alien icon states.
* Also fixes a runtime if you take control.
2016-05-17 22:43:36 -04:00
Leshana
8025076fa2 Issue #23 - Ported the carpfarm and listeningpost away mission maps (#96) 2016-05-17 20:35:28 -04:00
Cameron653
c2d5485fc5 Adds Zorren and also some major tail fixes. (#92)
* Adds Zorren. Tail fixes.

Exactly what it says on the tin.
Adds in both Zorren races.
Fixes species specific tails
Fixes hair colored species specific tails (partially)
Fixes hail colored tails (partially)
Fixes hail colored ears
Adds in more species related tails
(Ex: All the multiple xenomorph tails, monkey tail, stok tail, vox
armalis tail)
Note: For hair colored tails to fully work, they need to be greyscale.
This will require some editing later on, but for now, it works.

* ...Github didn't sync this for some reason.

* Fixes

* Fixes

* Fixes V2

Fix one bug
Cause 50 more

* Irrelevant
2016-05-17 20:34:52 -04:00
Arokha Sieyes
6c9a6264cf Gateway Icon Change + Fitness Center (#95)
* Shhh don't mind this.

* More gateway changes, also adds fitness room

Also gives the ability for some FBPs to have tails (we can sprite the tails later, it defaults to off)

* Issue #30 - Added icons and code for vore animals.

Also tweaked to be more in line with current codebase.

* Fix to leading space in alien.dm

* Makes Labyrinth.dmm compile and load in map editor. (#90)

Could use some work still though.
2016-05-17 20:03:45 -04:00
Leshana
d3c256d048 Merge pull request #93 from VOREStation/voremobs
Issue #30 - Added icons and code for vore animals.
2016-05-17 19:45:02 -04:00
Leshana
95666ddac1 Fix to leading space in alien.dm 2016-05-17 19:38:35 -04:00
Leshana
335f002ba9 Issue #30 - Added icons and code for vore animals.
Also tweaked to be more in line with current codebase.
2016-05-17 19:31:33 -04:00
Arokha Sieyes
50d83a8b72 Shhh don't mind this. (#91) 2016-05-17 16:11:20 -04:00
Cameron653
ef40afdaef Forgot to add add this part to vorepanel_vr
Quick and easy bugfix.
2016-05-17 14:11:43 -04:00
Yoshax
c53f214b7b Disables alternative title validation to allow for admins to give people/themselves retainable non-standard titles 2016-05-17 16:48:12 +01:00
Datraen
a17b92f46a Merge pull request #1672 from VOREStation/microdrop
Makes items fall through holders
2016-05-17 01:26:14 -04:00
Cameron653
459a2d9840 Adds in "Encase In Egg" vore type. (#88)
* This compiles, has a debug in a few areas

But doesn't actually work in game

* This didn't go with the first sync. booo.

* Actually gets egg TF to work. Fixes spacesuit sprites

* Makes the borgs stomach show up

* More  bugfixes!

* Adds in "Encase in egg"

* I forgot to change this
2016-05-16 23:20:25 -04:00
Datraen
eb0dc892fe Merge pull request #1676 from silveryferret/be_renegades
Adds Be renegade underneath Character Setup
2016-05-16 22:49:42 -04:00
Datraen
0d1c912b08 Merge pull request #1673 from Yoshax/shotglasses
Adds shot glasses + code qol
2016-05-16 22:34:19 -04:00
silveryferret
82f09c1642 Replaces BE_MONKEY with BE_RENEGADE
As title. Also adds Renegade into the antagonism tab underneath
character set up.
2016-05-16 21:20:30 -05:00
EmperorJon
d5295eccd1 Merge pull request #1674 from VOREStation/offsetfix
Revert to old_x and old_y after attack animations
2016-05-17 01:18:55 +01:00
Arokha Sieyes
49797b8dc3 Revert to old_x and old_y after attack animations (#85)
Does not use initial(pixel_x) and initial(pixel_y) for 'finishing' attack animations, so that mobs can have old_x and old_y updated to reflect a natural pixel offset (e.g. for mobs that are longer/taller than 32x32 and are nudged to fit into a tile).

For example, we have a 32x64 cyborg module which sets pixel_x, pixel_y, old_x, and old_y when selected, however attacking with it resets it to 0 as this doesn't respect old_x and old_y like all other mob anims do (see floating, etc).

Also why define this on atom and then literally never use it on anything other than a mob, in the... mob/animations.dm file?

_Sorry to keep making QOL PRs. I promise I'll send something cool eventually._
2016-05-16 19:16:54 -04:00
Cameron653
d199552fa0 Egg transformation. A few bug fixes (#76)
* This compiles, has a debug in a few areas

But doesn't actually work in game

* This didn't go with the first sync. booo.

* Actually gets egg TF to work. Fixes spacesuit sprites

* Makes the borgs stomach show up

* More  bugfixes!
2016-05-16 19:16:35 -04:00
Arokha Sieyes
d7e65b22ba Merge branch 'master' of https://github.com/VOREStation/Polaris into sync 2016-05-16 18:31:38 -04:00
Arokha Sieyes
15fbac6ef1 Revert to old_x and old_y after attack animations
Does not use initial(pixel_x) and initial(pixel_y) for 'finishing' attack animations, so that mobs can have old_x and old_y updated to reflect a natural pixel offset (e.g. for mobs that are longer/taller than 32x32 and are nudged to fit into a tile).

For example, we have a 32x64 cyborg module which sets pixel_x, pixel_y, old_x, and old_y when selected, however attacking with it resets it to 0 as this doesn't respect old_x and old_y like all other mob anims do (see floating, etc).

Also why define this on atom and then literally never use it on anything other than a mob, in the... mob/animations.dm file?

_Sorry to keep making QOL PRs. I promise I'll send something cool eventually._
2016-05-16 17:02:12 -04:00
EmperorJon
d8dabceb19 Merge pull request #1668 from Yoshax/loadoutpoints
Can now see how many points have been spent in each loadout category.
2016-05-16 21:50:54 +01:00
EmperorJon
56c286c073 Merge pull request #1671 from VOREStation/namedefines
Generic Station & System Name
2016-05-16 21:44:53 +01:00
EmperorJon
755e1957cb Merge pull request #1658 from VOREStation/improper
Fix the letter ÿ in nano-ui displays
2016-05-16 21:42:58 +01:00
Arokha Sieyes
61d38248c5 Generic Station & System Name
Makes the name of the starsystem and station generic such that it can be modified in global.dm and replace the strings where it is used. This won't have an effect on Polaris itself, but makes changing the name much more simple for forks. Using string concat constants on the advice of Psi.
2016-05-16 16:21:17 -04:00
Arokha Sieyes
7b03d64931 Makes items fall through holders
As in, scooped mob holders, like Teshari. If they throw an item, it falls out now rather than being trapped and eventually deleted in their holder object.
2016-05-16 16:21:07 -04:00
Arokha Sieyes
b91065dabb Makes items fall through holders
As in, scooped mob holders, like Teshari. If they throw an item, it falls out now rather than being trapped and eventually deleted in their holder object.
2016-05-16 16:11:24 -04:00
Yoshax
c6c372056a Gives reagents/reagent_containers the absolute pathing treatment 2016-05-16 21:07:20 +01:00
Arokha Sieyes
8e90199052 Generic Station & System Name
Makes the name of the starsystem and station generic such that it can be modified in global.dm and replace the strings where it is used. This won't have an effect on Polaris itself, but makes changing the name much more simple for forks. Using string concat constants on the advice of Psi.
2016-05-16 15:34:03 -04:00
Yoshax
5cb4ae9879 Adds shot glasses
Cleans up a list in the booze vendor
Removes tea from contraband and puts into the normal product list in the booze vendor
Adds the shot glasses to the autolathe and makes glasses there no longer children of bucket recipes
2016-05-16 20:06:10 +01:00
PsiOmegaDelta
6ce5eef293 Can now see how many points have been spent in each loadout category.
Also adds a small hack to fix #12560. Validation no longer occurs if the preference mob doesn't exist.
2016-05-16 17:23:08 +01:00
Arokha Sieyes
3014a8ce71 Merge pull request #80 from VOREStation/suit_tweak
Fixes suit rendering
2016-05-16 09:33:18 -04:00
Arokha Sieyes
c70cc6d03f Merge pull request #79 from VOREStation/gateway
Issue #23 - Fixed the Gateway
2016-05-16 09:33:06 -04:00
Arokha Sieyes
fdd80f4df9 Update update_icons.dm 2016-05-16 01:16:38 -04:00
Arokha Sieyes
ee52e8d9fe Fixes suit rendering 2016-05-16 01:14:35 -04:00
Leshana
2cd88ab4ca Issue #23 - Fixed the Gateway
* Ported gateway compatibilty with runtime z-level loading from old codebase.
* Built a new Gateway room next to EVA on the map.
* Fixed the beach level to not crash.
2016-05-16 00:00:51 -04:00