Commit Graph

367 Commits

Author SHA1 Message Date
Leshana
eae29b9d69 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sink 2016-05-30 22:43:05 -04:00
EmperorJon
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
EmperorJon
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
Ccomp5950
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
HarpyEagle
2aa0e29ae6 Fixes get_turf() runtime 2016-05-25 15:19:58 -04:00
HarpyEagle
dd9082f903 get_turf optimization
Checks isturf() and then locs instead of looping
2016-05-25 14:15:31 -04:00
Ccomp5950
3f2c95cfff Merge d3081d97ac3bd438fb2331b5aaeb40dadeaf5049 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 Sieyes
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
Hubblenaut
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
PsiOmegaDelta
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
PsiOmegaDelta
4286cd959e Resist tweaks.
Can now resist out of handcuffs and buckle restraints. Fixes #12359.
No longer resist out of every possible type of restraint at the same time.

# Conflicts:
#	code/modules/mob/living/carbon/resist.dm
2016-04-12 02:01:50 +01:00
woodratt
ab49ae802a 1.5.0 Striped Socks
- Added green, purple, blue, yellow, red, and orange striped socks. Thigh and knee high options.
2016-04-09 15:20:37 -07:00
Datraen
9c21e0bcdc Manually ports /tg/'s darkclick code.
https://github.com/tgstation/-tg-station/pull/10272 by Razharas.
2016-04-08 23:07:10 -04:00
Datraen
ca24446d7f Merge pull request #1287 from Kelenius/unitTests
Ports unit tests
2016-04-04 10:34:12 -04:00
Neerti
983192bf11 Merge pull request #1315 from Datraen/PrefVerbsPerms
Updates Preference Permissions, Re-adds Verbs
2016-04-01 16:53:52 -04:00
Datraen
41996815ae Gives categorization to the preferences as per the current staff structure. 2016-03-31 16:30:13 -04:00
Daranz
2482ddf55a Resolve problem with robot destructive analyzer
CallTechName() was borrowed from destructive_analyzer.dm for reuse in
the portable analyzer.

Resolves #12356
2016-03-31 16:10:07 -04:00
Yoshax
9b7b8656ba Merge remote-tracking branch 'upstream/master' into progressbars 2016-03-30 00:31:03 +01:00
Kelenius
c8b510b415 Adds unit tests
Port of https://github.com/Baystation12/Baystation12/pull/11808 and
several others
Fixes three overlapping cables ([192 / 158 / 1], [214 / 161 / 1], [122 /
197 / 1])
Fixes drill and mech drill having the same ID.
2016-03-29 17:42:22 +03:00
Yoshax
d0d3d3cb16 Merge remote-tracking branch 'upstream/master' into morepreferences 2016-03-27 00:17:24 +00:00
Kelenius
e883863f4b Merge branch 'master' into playingWithTravis 2016-03-23 17:12:11 +03:00
Yoshax
5d9596a72d Makes it possible to have more than 16 preferences 2016-03-21 18:56:27 +00:00
Yoshax
bae4900fc0 Shortens the in-hand check 2016-03-21 17:24:55 +00:00
PsiOmegaDelta
d6797056f2 Adds progress bars to tasks that take time 2016-03-21 17:13:23 +00:00
Datraen
996ce92f7f Merge pull request #1184 from Yoshax/510prep
Ports Byond 510 preperations from Bay
2016-03-20 13:45:40 -04:00
Datraen
fe9d3fd4c4 Merge pull request #1027 from Kelenius/mobCleanup
Changes types of ghosts and eyes
2016-03-18 13:50:47 -04:00