Commit Graph
1961 Commits
Author SHA1 Message Date
TheDZDandGitHub 9aeaeef3f8 Merge pull request #4882 from Fox-McCloud/fast-get-turf
Faster Get Turf from VG
2016-07-05 11:36:17 -04:00
Fox-McCloud 119c76ab0e Faster Get Turf from VG 2016-07-05 02:40:05 -04:00
Crazylemon64 ac3db33709 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-07-04 14:54:49 -07:00
Krausus 80ffe80530 Fixes round time being miscounted
It is now based on when the round actually started, rather than when the
world was first loaded.
2016-07-04 15:38:16 -04:00
Fox-McCloud b57391aba6 Minor Flag Refactor 2016-07-03 23:43:12 -04:00
TheDZD 4bfd6ce95a Changes numbers 2016-07-03 15:51:19 -04:00
TheDZD 3605aa5e4d Re-Adds Instability 2016-07-03 15:51:17 -04:00
Crazylemon64 0e50e4f27a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-07-02 15:37:58 -07:00
SamCroswell c09f8f65eb Removes Grey's Wingdings 2016-07-01 14:52:12 -04:00
Tigercat2000 82091296bd Merge remote-tracking branch 'upstream/master' into bay_equipping
Conflicts:
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	code/modules/client/preference/preferences.dm
	code/modules/client/preference/preferences_toggles.dm
2016-06-27 08:20:49 -07:00
KasparoVy 38717e3b03 Fragments Markings, Adds Tail and some Body Markings, Tajara Heads now have Ears
Adds Tajara inner ear and muzzle colouration as head markings, adds muzzle colouration for Unathi (sharp and round) as head markings, adds belly colouration for Tajara and Unathi as body markings.
Fixes issue where the Unathi stripe marking name in sprite_accessories was incorrect.
Also fixes a bug where setting your IPC's head to 'normal' gave it a random screen style that was often not compatible with the monitor head.
Does a bit of tidying up in tail generation mainly, but also in icon skin-tone handling and just about everywhere else I ended up working.
Adds ears to Tajara heads. Removes ears from tajara hairstyles.
Removes the now pointless Tajaran Ears hairstyle and renames the Tajaran hair objects appropriately.
Adds a Vulpkanin Body Marking and some Tail Markings.
2016-06-27 05:29:01 -04:00
TheDZDandGitHub b54b3a8fb2 Merge pull request #4775 from Fox-McCloud/mutate-fix
Wizard Mutate Spell Fix
2016-06-26 14:58:54 -04:00
Fox-McCloud c6117cfa5a Wizard Mutate Spell Fix 2016-06-25 02:46:17 -04:00
Crazylemon64 a4fde648e7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-06-24 16:03:10 -07:00
tigercat2000andFox McCloud 732c3b4ae5 Goonchat (#4744)
* bicon regex run

* Remove all \black

* Goonchat from /vg/ / Goon

Whoo!
Special thanks to @Tastyfish for the macro2html thing so all of our
horrible color macros keep working and don't fail horribly <3

* Fixes and changes n stuff

- Made ping sane again (the fuck PJ)
- Updated chat CSS
- Fixed like one problem with a color macro

* whoops

* Restore /vg/'s pingloop stuff (used to avoid fucking up is_afk)

* Strip problematic tags from tcomm scripts

- <audio>
- <video>
- <iframe>
- <script>

* Fix human examine icon

* Name hotkey elements

* Removed old stylesheet
2016-06-23 16:56:15 -04:00
taukausanake 35457bd80c Forgot to remove bee HUD
Yeah, can't do this so removing it. Maybe I'll revisit it once I can muster enough thought processing on it
2016-06-22 23:20:50 -05:00
taukausanake 795271048d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into plant_hud 2016-06-20 11:23:28 -05:00
Tigercat2000 5d48cc22b7 Merge remote-tracking branch 'upstream/master' into bay_equipping
Conflicts:
	code/modules/client/preference/preferences.dm
2016-06-19 16:28:57 -07:00
KraususandFox McCloud 30517a9b10 Adds Error Handling and Realtime Runtime Reviewal (#4679)
* Adds Error Handler

Adds a /world/Error proc to handle runtime errors. This proc replaces
the normal runtime logging behavior, providing the following
improvements:

- Adds timestamps to runtimes
- Pads or omits certain lines
- Continues logging runtimes after the 99th (with less info, as provided
by BYOND)
- Adds ckey and accurate xyz to usr info
- Continues including usr info after 19th runtime
- Silences spammy runtimes (by default, a runtime that occurs 10 times
in 10 minutes gets ignored for the next 10 minutes)

* Adds runtime viewer

Also fixes a minor mistake in the error handler

* Sanitizes HTML in Error Viewer

Also removes the stray return from the end of the error handler

* Prettifies Error Viewer

Now uses browser datum and some extra bits of formatting, inspired by
the changes made by @PJB3005

* Error Handling Improvements

- Skipped error counts now show up in the error viewer
- Proper runtimes caught by a process are now sent to the main error
handler
- The error handler and viewer can now handle a provided src, such as
one from a processing runtime
- Moved some info generation into helper procs
2016-06-19 12:53:07 -04:00
KasparoVyandFox McCloud 3dba1b2886 Noir Doesn't Grey out HUD, Adds Remaining Glasses for Vox, 'Yi' to Vox-pidgin syllables & Framework for Icon-based Skin Tone, Fixes #3138, Greyscales Vox Hair (#4614)
* Ports #9294 and #9322 from VG: 'Yi' to Vox-pidgin and Framework for Icon-based Skin Tone (Feat. Vox) and Glasses/Goggles for Vox.

Both ported PRs by Intigracy.

Also adds all remaining in-use glasses/goggle sprites for Vox. I cleaned up the code a bit while I was in there. Otherwise, that's it.

Furthermore, randomizing skin tone doesn't seem to work for Vox despite their being specified in the conditional lists and s_tone being not null.

* Morph Support

* CMA Support

* Ports Intigracy's vgstation13/pull/9460, Noir Vision No Longer Greys Out HUD.

* Fixes Positioning of Vox Jensen Shades East+West facing Sprites.

Fixes Heist Goofery

Game-mode (not one-click antag) Heist tweaked and returned to working order now that I've found out how to test the actual game-mode (after temporarily adjusting the population requirement).

Vox Raiders won't spawn in with whatever socks were in their selected spawn-character's preferences anymore.

Additionally, the set_species proc now zeroes out skin tone if the species doesn't have skin tone to avoid goofing up the icons on initial generation.

Also condenses the code in preferences_setup character creation icon generation. Made it use the individual species' skin-tone handling procs instead of code snowflaked into preferences_setup.dm.

* No More Vox Tail Colours, but they can Colour Their Hair.

* Removes unneeded 'src's and retroactively prohibits colouring tails on species without HAS_SKIN_COLOR.

Colouration won't be applied to src's tail unless HAS_SKIN_COLOR is in
src's species bodyflags.

* Tidies up some Lists in CharPrefs and Retroactively Prohibits Vox Hair Colouration

* Reverts unnecessary commenting out of vox armalis post-spawn handling parent call.

* Adds Emerald and Azure Vox Skin Tones.

* Stealthy Wryn Typo Fixed.

* Greyscales Vox Head+Facial Hair and Adds More Default Colours in Species Definitions

* Gives Vox Raiders Default Hair Colour and Fixes Bug where Roundstart Raiders don't get Random Skin
2016-06-19 11:35:36 -04:00
Tigercat2000 d927504dc1 Fix compile, Add job restriction column, make job skirts betterish
Job skirts now only cost 3 points, any further job skirts selected will
not count towards points. Yes, you still spawn with multiple skirts if you
are in a position that has them, no, I can't fix it.
2016-06-13 21:03:58 -07:00
taukausanake 53a34039da FUCK 2016-06-11 18:48:47 -05:00
monster860andFox McCloud 42639bcab5 Traders Event (#4016)
* Traders Event

* lien notes

* Fixes indent

* Gets rid of things Fox doesn't like.

* how did that get deleted

* Get rid of things maintainers don't like

* Adds some crates to the shuttle, and a recall console to the base.

* EVENT_LEVEL_MAJOR, and make it weight 0 (out of rotation)

* line nutes
2016-06-11 12:47:20 -04:00
taukausanake db7b819d1f Fixes
Credit to Monster860 for telling me what I did stupid. HUD still doesn't show however so need to find out that next
2016-06-09 21:36:23 -05:00
taukausanake 130096aced Hydroponic HUDs
Everything is done. Except it doesn't work. I must be missing something somewhere but otherwise I did everything that appeared needing to do. Based it off of mech diag HUD so that might be the issue.
Code as of now does not let you join the server. Need to revert bit by bit and find out what I did wrong
2016-06-09 17:46:09 -05:00
Matt Milosevic a162488f03 Totally refactors and updates the ruins code 2016-06-03 21:26:25 +02:00
TheDZD 4facfcb5a4 More fixes and sprites 2016-05-31 22:51:14 -04:00
TheDZD a4e950d21a Compiles, and guns work™ 2016-05-31 22:50:55 -04:00
TheDZD 95d7a68a75 Here we go again... 2016-05-31 22:50:53 -04:00
TheDZD 6f8e027296 Merge pull request #4505 from Fox-McCloud/holy-weapons
Ports TG's Holy Weapons
2016-05-29 20:48:35 -04:00
Fox-McCloud 78437d5e46 Ports TG's Holy Weapons 2016-05-26 23:38:31 -04:00
Matt 182708c445 godhelpme 2016-05-26 22:26:38 +02:00
Matt e158625bb8 Goddammit 2016-05-26 21:54:58 +02:00
Tigercat2000 50fce53b8c Clean up the horrific mess of 6bae633 through 468944f
CODE STYLE MATTERS
2016-05-25 15:27:00 -07:00
Fox McCloud 3ee2e470a1 Merge pull request #4331 from KasparoVy/voxhair
Refactors Hair so it's on the Head + Adds a Vox Hairstyle + Fixes/Refactors Morph + Features to Morph and CMA...
2016-05-13 15:36:34 -04:00
TheDZD 06eafc8a25 Merge pull request #4407 from Fox-McCloud/no-guns
Refactors Species Gun Handling
2016-05-10 22:46:52 -04:00
KasparoVy 13003fe351 Merge branch 'temp2' into temp 2016-05-10 00:10:15 -04:00
TheDZD 596485e304 Merge pull request #4385 from FlattestGuitar/tapegag
Tape gags for all
2016-05-09 19:12:53 -04:00
Fox-McCloud 4f8c42484e Refactors Species Gun Handling 2016-05-09 16:31:51 -04:00
Tastyfish befd7a4e5c Removes Default() 2016-05-07 19:31:40 -04:00
Mieszko Jędrzejczak 48888c891c Tape gags for all 2016-05-07 15:02:38 +02:00
Tastyfish 82a9612653 Some math, mob helper/ one-liner optimizations 2016-05-06 04:38:59 -04:00
KasparoVy 9015f11f41 Fixes Morph Being Borked + Additional Features for Morph and C.M.A.
Before it wouldn't update skin colour or eye colour, and ended up breaking the sprite such that C.M.A wouldn't have an effect on it after.

Now it works perfectly fine, C.M.A works just fine too before and after

STAGE 2: Refactors Morph

So you change gender first and thus can actually access male beard styles, then you choose hair style and hair colour, then beard style and beard colour, then skin tone or body colour at the very end.

STAGE 3
Adds Head Accessory, Head Accessory colour, marking style and body accessory to Morph and C.M.A.
2016-05-03 01:50:16 -04:00
TheDZD 42a5810de3 Merge pull request #4326 from Fox-McCloud/even-less-lag
Makes Explosion and Singulo Defer Based on CPU
2016-04-30 09:57:01 -04:00
Fox-McCloud 2d90585ecc Makes Explosion and Singulo Defer Based on CPU 2016-04-30 05:17:45 -04:00
IK3I 8d18ce19df Incorporates Suggestions for code format
Redoes get_damaged_organs() to use defines and flags instead of strings.
2016-04-29 21:43:19 -05:00
TheDZD c0ccc56969 Merge pull request #4288 from Fox-McCloud/door-wands
Ports Door Wands
2016-04-26 19:31:41 -04:00
Fox-McCloud d03a7ba7b5 fixes and defines 2016-04-26 00:51:24 -04:00
TheDZD 18a63c788d Merge pull request #4267 from tigercat2000/CRAZY_HUDS_AMIRITE
-tg- HUD styles
2016-04-25 19:57:59 -04:00
TheDZD cdc20258a1 Merge pull request #4212 from Tastyfish/bans
Cleans up special role jobbans
2016-04-25 18:34:37 -04:00