Commit Graph
183 Commits
Author SHA1 Message Date
Eearslya 85c3e22873 Polaris sync 2016-08-06 20:34:44 -07:00
commaandYoshax 2fc033ee0e Ports /vg/ get_turf
Gotta go faster.
Possibly undocumented behaviour of get_step?
2016-07-23 18:00:50 +01:00
YoshaxandGitHub e28c4361f7 Merge pull request #2015 from Neerti/12/16/2015_newwizard
Dry-dock phase for Technomancer
2016-07-10 03:43:35 +01:00
PsiOmegaDeltaandYoshax 60593ce024 Bay-tweaks.
Ultra dynamic MedHUD states.
2016-07-10 03:14:22 +01:00
PsiOmegaDeltaandYoshax 8e82e70056 Makes the medHUD smoother.
It now has more stages, giving the viewer a little more detail about how badly you're doing.
Port of https://github.com/ParadiseSS13/Paradise/pull/4726.
2016-07-10 03:13:20 +01:00
PsiOmegaDeltaandYoshax 691349864b Adds variety to the critical MedHUD states
Makes it easier to prioritize who will receive treatment.
Port of https://github.com/tgstation/tgstation/pull/17279.
2016-07-10 03:13:05 +01:00
Cameron653 13d75315bb Adds in selectable egg TF, reverts #382, a few tf fixes. 2016-07-02 20:52:07 -04:00
Neerti 20a3bd5b26 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-06-26 20:14:29 -04:00
Neerti 53d60eb554 Does even more work.
NOTE: asphyxiation is broken!
2016-06-23 05:21:04 -04:00
Arokha Sieyes 0350a266d1 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
# Conflicts:
#	code/modules/client/preferences.dm
2016-06-14 12:01:42 -04:00
Yoshax fff26d1289 Fixes GRC to make it not shit 2016-06-13 20:20:17 +01:00
Arokha Sieyes 878cf928f8 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
# Conflicts:
#	.travis.yml
#	vorestation.dme
2016-06-13 13:12:40 -04:00
Arokha Sieyes 7b4d571889 Makes communicators great again 2016-06-11 22:05:01 -04:00
Arokha Sieyes 3cb7395279 Rearranges get_mobs_and_objs_in_view_fast
Also adds the ability to select between ghost eyes and ears.
2016-06-11 21:52:52 -04:00
Arokha Sieyes eb6f979fc0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
# Conflicts:
#	vorestation.dme
2016-06-07 18:37:47 -04:00
Yoshax 0fb98bbabd Scheduler now uses btime, and other improvements 2016-06-01 17:56:07 +01:00
Leshana eae29b9d69 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sink 2016-05-30 22:43:05 -04:00
EmperorJonandYoshax 741706e9e3 Underwear + setup merges (#1812)
* Manually merges 12595 and 12461.

* Moron Jon 2: Moron Boogaloo

* Makes Yosh happier
2016-05-30 19:19:45 +01:00
Leshana e004a8bfc0 Merge remote-tracking branch 'polaris/master' into sink
# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme
2016-05-29 16:22:07 -04:00
EmperorJonandYoshax 5a545854a4 Underwear Datums (#1794)
* One more step to bringing our preferences/setup stuff in line with Bay.

* Whoopsy

* Jon is a moron, more at 11.
2016-05-29 17:29:36 +01:00
Yoshax 288ae3d274 Merge pull request #1796 from VOREStation/realisticfbp
The Terminator Update
2016-05-29 15:56:22 +01:00
Jon 21f898e047 First commit of manual port of BS12
#13042
and
#13086
2016-05-29 00:56:11 +01:00
Ccomp5950andArokha Sieyes 7277885c73 Couple of optimizations to get_mobs_and_objs_in_view_fast() 2016-05-28 13:54:10 -04:00
Arokha Sieyes 76567bb7a2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
# Conflicts:
#	code/modules/mob/living/carbon/human/whisper.dm

Whisper modified locally, and deleted upstream (in a change I made, so I know it's safe to remove).
2016-05-26 09:59:18 -04:00
Datraen 4448a6f469 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3
# Conflicts:
#	code/modules/mob/living/say.dm
2016-05-26 08:20:41 -04:00
HarpyEagleandArokha Sieyes 2aa0e29ae6 Fixes get_turf() runtime 2016-05-25 15:19:58 -04:00
HarpyEagleandArokha Sieyes dd9082f903 get_turf optimization
Checks isturf() and then locs instead of looping
2016-05-25 14:15:31 -04:00
Ccomp5950andArokha Sieyes 3f2c95cfff Merge d3081d97ac 2016-05-25 00:05:37 -04:00
Arokha Sieyes ad27e107dd Adjust a comment to make sense. 2016-05-21 19:08:05 -04:00
Datraen bb7713b2a8 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3
# Conflicts:
#	code/game/objects/items/devices/multitool.dm
2016-05-19 17:31:25 -04:00
EmperorJon 56c286c073 Merge pull request #1671 from VOREStation/namedefines
Generic Station & System Name
2016-05-16 21:44:53 +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 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
Leshana e0a77f7d2f Fix the letter ÿ in nano-ui displays
* Particularly noticable on the cartridge button of the PDA, any time we transmit a name containing \improper or \proper using nanoui it shows up as ÿ
* This is becuase BYOND internally handles these escapes by simply using character 0xFF etc.
* We'd better strip them out before sending them as JSON data so they aren't rendered as ÿ when treated as utf-8 encoding.
2016-05-14 23:26:15 -04:00
Leshana 2be7b323a5 Fix the letter ÿ in nano-ui displays
* Particularly noticable on the cartridge button of the PDA, any time we transmit a name containing \improper or \proper using nanoui it shows up as ÿ
* This is becuase BYOND internally handles these escapes by simply using character 0xFF etc.
* We'd better strip them out before sending them as JSON data so they aren't rendered as ÿ when treated as utf-8 encoding.
2016-05-14 23:24:08 -04:00
Arokha Sieyes 231ee5bf35 Work on satisfying travis 2016-05-14 13:38:24 -04:00
Datraen 3d9435c9b3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3
# Conflicts:
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
2016-05-12 17:24:55 -04:00
Arokha Sieyes 17a64bebea Merge branch 'master' of https://github.com/PolarisSS13/Polaris into breakfix
# Conflicts:
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/new_player/new_player.dm
#	vorestation.dme
2016-05-12 13:02:51 -04:00
Leshana 88e46b624a Issue #4 - Implement custom tails, ears, and taurs.
- Added datums and icons for custom ears.
- Added datums and icons for custom tails.
- Added datums and icons for taurs, now a subtype of tails.
- Integrated into icon_updates() for in game appearance.
- Integrated into preferences_setup() for character setup preview.
- Added ears and tails to the character setup screen.
- Enabled nagataur support for micro/macro step-over messages.
2016-05-11 23:25:17 -04:00
Leshana abbf0c7fc0 Issue #4 - Porting resize (micro/macro) systems.
* Instead of "playerscale" we are using pre-existing variable
 "size_multiplier" but we move it to /mob/living
* Added basic mechanics of size changing.
* Mousetraps snap small people even if they have shoes.
* Big people can walk over small people, or stomp them, or capture them
 in foot slot.
* Ported holder for micros, making small people scoopable.
* Tied held micros in with the vore code so they are edible.
* Ported size-altering reagents and recipies.
* Ported size gun along with associated sprites and sounds.
2016-05-08 23:11:03 -04:00
Arokha SieyesandLeshana 807bfc8888 Basic Vore Implementation for #1 (#25)
* Basic Vore Implementation for #1

Adds vore sounds, bellies, vore procs, all types of vore except
macro/micro as that is not implemented yet. Also adds a few type2type
methods and a text method that we had before.

* Ending linebreaks

* More crlf

* Globalize two lists

* Removed interface type
2016-05-07 23:51:53 -04:00
Zuhayr 6edb8b31f3 Made slimes more interesting. 2016-05-06 04:07:52 +09:30
Datraen 44edf86ccb Merge pull request #1455 from Yoshax/gendertweak
Gender tweaks and adjustments
2016-05-05 10:18:25 -04:00
HubblenautandDatraen 9338f770f8 Ninja fixes and changes (#1547) 2016-05-04 13:45:25 -04:00
Datraen f09304c508 Adds the new xeno mob system, implemented with slimes. 2016-04-21 11:05:18 -04:00
Yoshax aa592e3b35 Gender tweaking
Limits biolgical gender by species and defaults to male/female.
Can also set gender identity which determines which is displayed upon examination and suchlike along with being shown in medical records
2016-04-20 20:07:14 +01:00
Yoshax 0577738032 Character setup gender selection changes
Different species now have different gender selections available.
2016-04-20 16:27:55 +01:00
Yoshax 26192e2b32 Fixes an error 2016-04-20 15:36:13 +01:00
PsiOmegaDeltaandYoshax a3f8bc815e Round start timer now remains at 0 until the round actually starts. 2016-04-20 15:27:59 +01:00
Neerti 3667780871 Adds verb to change eye color at will (if mechanical)
Adds a verb used by humanoid mobs that have mechanical eyes, which allows them to pick a new color, and have it applied instantly.
Adds some helper functions, specifically hex2rgb(), to convert hexadecimal colors to a list of numbers for r, g, and b.
2016-04-16 06:14:09 -04:00