Commit Graph
1961 Commits
Author SHA1 Message Date
Fox McCloudandGitHub 607642d4ef Revert "Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more..." 2016-08-08 23:26:51 -04:00
Fox McCloudandGitHub 86d0c0b2b9 Merge pull request #5147 from KasparoVy/tail-markings
Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more...
2016-08-08 21:58:45 -04:00
Tigercat2000 0821e5bd04 Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
Conflicts:
	code/game/gamemodes/objective.dm
2016-08-08 06:21:02 -07:00
Crazylemon64 031dd2bb3d Iiiiit's merge conflict time!
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
2016-08-07 23:42:02 -07:00
Kyep e1dccb435b Update 6
- Split EXP_TYPE_CREW into EXP_TYPE_LIVING (all living mobs) and
EXP_TYPE_CREW (actual crew positions). Job unlocks use EXP_TYPE_CREW.
General playtime reports use EXP_TYPE_LIVING. Playing corgi doesn't help
unlock jobs, but it does show in your stats.
- Added tracking for karma-locked jobs as a department in stats.
- Added quite a few safety checks.
- Split the per-client part of update_exp into update_exp_client
- Added new config option to let admins bypass the system, intended for
testing
- Moved defines to code\__DEFINES\preferences.dm
2016-08-06 14:39:35 -07:00
Fox McCloudandGitHub a15721b22a Merge pull request #5209 from Krausus/OnceYouLeaveYouCannotComeBack
Changes to Player Respawnability
2016-08-03 19:12:04 -04:00
Crazylemon64 7db4094a38 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation 2016-08-03 13:31:42 -07:00
Tigercat2000 9f3cdb43f7 special_role/objective refactor
Refactored most instances of special_role setting/checking to use new
SPECIAL_ROLE_X defines in code/__DEFINES/gamemode.dm

Removed relative pathing from objective.dm and split large if statements
into multiple, plus a bunch of styling fixes

Refactored every instance of `istype(ticker.mode` into a GAMEMODE_IS_X
define in code/__DEFINES/gamemode.dm. Done primarily for when someone gets
around to making gamemode code less AWFUL
2016-08-01 21:29:19 -07:00
Fox-McCloud ffb685b2f1 Sound Defines 2016-08-01 22:28:37 -04:00
Crazylemon64 bc93078da5 Merge conflicts begone 2016-08-01 18:28:47 -07:00
TheDZDandGitHub 0cc2051f8a Merge pull request #5251 from Fox-McCloud/fire-system
Implements Fire System
2016-08-01 19:39:50 -04:00
Crazylemon64 bf2bcbce67 Removes most hard-coded z level checks 2016-07-31 21:29:03 -07:00
Krausus 03abd702e5 Adds early abandon penalty period and other tweaks
- New config option to set how many minutes is too early in a round to
abandon it
- Suicide-ghosting and cryo-ghosting now only make you non-respawnable
during the penalty period
- Manually entering a cryopod now despawns you 90% faster
- Joining as a drone now has a confirmation box
2016-07-29 18:26:54 -04:00
Fox-McCloud bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
Aurorablade 9735ff78ac shuttles 2016-07-28 23:47:05 -04:00
KasparoVy 6c54d49053 Hair can now cover facial hair, glasses are no longer covered by hair/head accessories.
An issue especially prevalent with Vulpkanin, whose facial fur patterns
are normally comprised of two parts (head accessory and facial hair)
that both ended up covering much of the glasses a character would be
wearing at any given time due to the nature of the sprites.
2016-07-28 23:27:13 -04:00
Crazylemon64 94c0bbff6a Something to show to DZD 2016-07-28 19:07:02 -07:00
KasparoVy 39d3d64207 Staying up to date. 2016-07-28 17:02:07 -04:00
TheDZD 7fa74a1d1e Re-adds PDA slot 2016-07-21 13:04:02 -04:00
KasparoVy 0232a7a427 Keeping up to date. 2016-07-21 11:57:15 -04:00
TheDZDandGitHub eb2aec4db7 Merge pull request #5090 from Fox-McCloud/mob-death-refactor
Refactors Simple Animal Death and Implements Spawners
2016-07-21 10:08:25 -04:00
TheDZDandGitHub a58245e109 Merge pull request #5131 from Fox-McCloud/cleanup
Cleans up Vars
2016-07-21 09:16:03 -04:00
Fox-McCloud 00a470fd6d removes stupid sdisabilities 2016-07-21 02:24:54 -04:00
Krausus f7ea1f3066 Fixes overlapping antag and bot HUDs 2016-07-20 22:50:11 -04:00
KasparoVy eb4a14cdfb Adds secondary hair themes, darkens Tajara, fixes Skrell/human sprite issues, Skrell secondary hair-themes, CMA and Morph support and more.. 2016-07-20 15:35:29 -04:00
KasparoVy b497aafb90 Darkens Unathi Horns/Spines/Frills, Adds Secondary Facial Hair Colours/Support, Further Adjustment to Tigerhead/TigerheadFace Sprites
You can now colour the webbing of webbed Unathi frills independently.
Morph and CMA support has been included.
Splits tigerhead sprites into 3 versions in order to better fit the
different ears of the three species that can use it.
2016-07-19 05:58:50 -04:00
Tigercat2000 9f8ba253c9 Saycode refactor/improvements
- Refactored multiple bits of saycode to be less eyeburning code
 - Radios now properly report special channel messages (binary, hivemind)
 - Animals with no speak list no longer show unfiltered messages to
   everyone.

 - Fun part:
   - Improves handling of headsets for the two ear system.
     - The right headset will now be talked into if the left headset
       reports that it is unable to send the message on the chosen
       channel/mode.
     - This means that instead of having to swap headsets around, wearing
       a headset on either ear will grant you access to all of it's
       channels.
     - The left headset will take priority, which really only affects when
       it's set to a non-standard frequency.
2016-07-18 19:17:11 -07:00
SamCroswell 7fc24c2688 Merge Conflicts Resolution. Again. 2016-07-18 19:43:38 -04:00
Fox-McCloud b9489589b4 Refactors Simple Animal Death and Implements Spawners 2016-07-18 04:13:56 -04:00
KasparoVy 005066d891 Merge remote-tracking branch 'upstream/master' into tail-markings 2016-07-17 19:25:03 -04:00
KasparoVy 710c722535 Tidies up and Finalizes Alt Heads, adding Morph + CMA support + more...
Another parameter has been added to the update_body proc that allows you
to force the regeneration of limb icons. Absolutely crucial to alt_heads
as, without this functionality, you would never be able to change the
head after you spawned via Morph or CMA among other issues.
2016-07-17 19:23:41 -04:00
Fox McCloudandGitHub d8b975e18a Merge pull request #5065 from Krausus/AdminLogTweaks
Admin Log Tweaks: Trialmin Visibility, Toggling, Spam Reduction
2016-07-16 23:42:43 -04:00
SamCroswell 15a8b1d7d6 Merge Conflict Resolution 2016-07-16 18:47:18 -04:00
Fox McCloudandGitHub 7c790a8b21 Merge pull request #4780 from Crazylemon64/space_ruins
Crazypilot's Space Ruins Port
2016-07-15 22:55:51 -04:00
Krausus 4c0f9ad01d Admin Log Tweaks
- Makes all admins see admin logs
- Adds a toggle for seeing admin log messages
- Removes admin log messages for jumping ghosts
2016-07-15 22:00:16 -04:00
Fox McCloudandGitHub be8cc0432d Merge pull request #4691 from taukausanake/plant_hud
Hydroponics HUD
2016-07-15 21:47:36 -04:00
SamCroswell cfc15e2dc2 Personal Crafting - What's the point of leaving todos if I don't actually do them? 2016-07-15 16:41:31 -04:00
SamCroswell 0466499f86 Personal Crafting - Initial Commit 2016-07-15 16:25:37 -04:00
KasparoVy 766245091b Back up to date. 2016-07-15 13:00:35 -04:00
SamCroswell e139f81412 PDA Slot Removal + PDA ID Changes 2016-07-15 00:54:14 -04:00
Fox McCloudandGitHub 3934b9f841 Merge pull request #4841 from DaveTheHeadcrab/grey_speech_fix
Grey Update
2016-07-11 23:13:38 -04:00
SamCroswell 963ca2ca79 ACTUALLY Resolves The Merge Conflicts (Remember To Save, Kids) 2016-07-11 13:06:40 -04:00
SamCroswell d79302ede6 Merge Conflict Resolution 2016-07-11 13:04:30 -04:00
Fox-McCloud 7165360832 Blood Refactor+Fixes 2016-07-10 02:58:00 -04:00
Crazylemon64 a779fc8663 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins
All hail glorious leader tigercat
2016-07-08 00:16:28 -07:00
Fox-McCloud 2e3d8bbbc6 Merge remote-tracking branch 'upstream/master' into hit-reactions 2016-07-07 22:50:53 -04:00
Tigercat2000 71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Fox McCloudandGitHub 277c3216d1 Merge pull request #4797 from TheDZD/GENETICS-PLAYER-ANGRY-GENTICS-PLAYER-SMASH!!!
Re-Adds Instability
2016-07-07 22:26:58 -04:00
Fox-McCloud 14cfc90ff9 TG Hit Reaction Port+Armor Fixes 2016-07-07 21:17:03 -04:00
TheDZDandGitHub 412d4cf501 Merge pull request #4866 from Fox-McCloud/flag-change
Minor Flag Refactor
2016-07-05 19:47:16 -04:00