cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-17 17:16:50 +01:00
Code Issues Packages Projects Releases Wiki Activity
31,036 Commits 17 Branches 2 Tags
d9758cf31eb13405bb27e3bb2dee677a3d81e7d2
Commit Graph
7115 Commits
Author SHA1 Message Date
Aurorablade d9758cf31e Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub 2016-12-09 16:50:29 -05:00
Fox McCloudandGitHub def08f87ed Merge pull request #5943 from Kyep/cryo_mechparts 
Fix for medbay cryo never auto-ejecting patients with mech limbs
 2016-12-08 19:03:25 -05:00
Aurorablade 81e740e6e5 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub 2016-12-06 21:51:53 -05:00
Kyep d5e3e14dc9 Requested changes 
- Creates "has_organic_damage" proc and updates cryopod and medibot to
use it.
- For non-human mobs, this proc returns 1 for damaged mobs and 0 for
full-health mobs.
- For human mobs, this proc returns 1 for mobs with damage to organic
parts, and 0 for mobs that are either full health, or have only got
damage to robotic limbs.
 2016-12-05 14:21:32 -08:00
Fox McCloudandGitHub 029133a9ad Merge pull request #5945 from Markolie/aieye 
[s]Fix AI static exploit
 2016-12-04 16:02:50 -05:00
Markolie 8b2933b0a1 Fix AI static exploit 2016-12-04 20:03:17 +01:00
Crazy LemonandGitHub 51822ab940 Revert "Revert "Makes the admin logout tracking system actually work"" 2016-12-03 02:23:18 -08:00
Crazy LemonandGitHub c8f54b4d53 Revert "Makes the admin logout tracking system actually work" 2016-12-03 01:53:47 -08:00
Crazy LemonandGitHub 5b9375e312 Merge pull request #5917 from Crazylemon64/admin_logout_notify_fix 
Makes the admin logout tracking system actually work
 2016-12-03 00:40:09 -08:00
Aurorablade fa1aa894ea Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-12-01 18:04:07 -05:00
Fox McCloudandGitHub cf57887f88 Merge pull request #5914 from KasparoVy/fixes-the-pictures 
Tails/body accessories now render properly in ID card photos, 'HD' Char. Preview Icon
 2016-12-01 10:18:25 -05:00
Crazylemon64 3c9516b1eb And your little gloves too! 2016-11-27 14:33:23 -08:00
Crazylemon64 10e06abd9b Brings the fur equipment in line with other loadout gear 2016-11-27 13:30:50 -08:00
Crazylemon64 8271a89dab Makes the admin logout tracking system actually work 2016-11-27 12:00:57 -08:00
Crazy LemonandGitHub 9418fdf204 Merge pull request #5916 from Fox-McCloud/status-fixes 
Fixes Faint and Mickey Finn
 2016-11-26 13:41:44 -08:00
Fox-McCloud ed3a5252c8 Fixes Faint and Mickey Finn 2016-11-26 16:09:00 -05:00
Aurorablade 6ac0c309ec copy and paster errrrrrrrr 2016-11-26 01:34:21 -05:00
KasparoVy e06218371f Sharper character creation preview images, tails/body accessories now show up in ID photos. 2016-11-25 17:55:57 -05:00
Aurorablade 21781d7be8 Crazy lemon comments. 2016-11-22 02:22:39 -05:00
Aurorablade 0c637cebfa Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub 2016-11-22 01:48:56 -05:00
KasparoVyandCrazy Lemon 30a8a5feb3 Fixes Disability/Shock Stuttering, Resolves #5899 (#5900) 
* Fixes Stutteing.

The 0 argument was busting this proc because it meant that the current
value of stuttering would be the only one stuttering would ever get set
to through SetStuttering. It didn't even use the 'amount' value.

This fixes it as per the way it used to be
https://github.com/ParadiseSS13/Paradise/commit/6a7f7394a807cd8a028d5bb2a1608927c8e4474f#diff-2de2df982739a4fbdb54a4b2715d6f92L114.
 2016-11-21 21:59:31 -08:00
Crazy LemonandGitHub 405fe1bb54 Merge pull request #5842 from Fox-McCloud/reagent-reorganization 
Reagent Reorganization
 2016-11-21 16:54:41 -08:00
Aurorablade 18e9475143 damn conflicts 2016-11-15 15:36:27 -05:00
Aurorablade 5d392b36a4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-11-15 15:30:36 -05:00
Aurorablade 37a421b0a8 might as well fix this conflict while i am at it 2016-11-15 15:29:04 -05:00
TheDZDandGitHub 220ed7b27b Merge pull request #5872 from Fox-McCloud/bsa 
BSA Tweaks
 2016-11-13 20:27:27 -05:00
TheDZDandGitHub 9807576359 Merge pull request #5875 from Fox-McCloud/vision-fix 
Fixes Simple Mobs Attacking Pods/Mechs Across Z-Levels
 2016-11-13 19:52:24 -05:00
Crazylemon64 5bf1ad3a18 Vision no longer blinks the blur overlay if your eyes are hurt 2016-11-12 14:14:20 -08:00
Fox-McCloud 55ffd16db8 Fixes Telekinetic Simple Mobs 2016-11-11 10:39:50 -05:00
Aurorablade 1a944b93cc comments be commenting. 2016-11-11 00:46:43 -05:00
Fox-McCloud fcc20ac6bc BSA Tweaks 2016-11-09 22:36:03 -05:00
Fox-McCloud 14e2eb8eb0 consumables 2016-11-08 10:26:29 -05:00
Crazylemon64 6ec712df8c Fixes defib leaving people in deadchat, n2o paralyse time 2016-11-06 21:36:24 -08:00
Fox-McCloud 61da53cca1 create reagents proc 2016-11-06 14:37:47 -05:00
Fox-McCloud c0e4b5bdc9 Fixes Xeno Stuns 2016-11-05 00:46:07 -04:00
Aurorablade 23e392f0ef Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-31 22:38:14 -04:00
Fox McCloudandGitHub 911fa70e1a Merge pull request #5601 from Crazylemon64/status_effect_overhaul 
Ports over the status effect unification from the extreme refactor
 2016-10-30 22:40:24 -04:00
Aurorablade 1a6803c7bb Comments done mostly...Slughter demon whispers runtimes. 2016-10-27 20:44:54 -04:00
Markolie c30ec1c64b Fixes Ripley Goliath upgrade occupant check 2016-10-26 00:28:28 +02:00
Markolie cb8358d553 Fix SNPC runtimes 2016-10-25 21:49:17 +02:00
Aurorablade f587cadb0f blurgh 2016-10-24 22:34:02 -04:00
Aurorablade 0a265f963c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-24 22:30:16 -04:00
Aurorablade 306520660d something something merge conflicts 2016-10-24 22:30:02 -04:00
Fox McCloudandGitHub 5fb35e7b23 Merge pull request #5809 from Markolie/idchecks 
Fix up a number of ID checks
 2016-10-24 15:52:01 -04:00
KasparoVy 82cf3fb93d Fixes a bug where certain species could not select undergarments. 
Their species names were just missing from the species_allowed
definitions.
 2016-10-23 23:47:51 -04:00
KasparoVy b8c6e5c6e5 Fixes 2 Bugs with PR #5416 
First bug: Changing your alt head in CMA wouldn't update it correctly.
You had to proc update_body(1, 1) twice in order to do it because of
where the head_organ.handle_alt_icon() proc call was placed in
organ_icons. Resolved

Second bug: Lack of sanity and inability to select head marking styles
with "all" alt heads allowed. Resolved
 2016-10-23 23:14:53 -04:00
Fox McCloudandGitHub 45ba4d157a Merge pull request #5416 from KasparoVy/tail_markings_mark2 
Marking Refactor, Adds tail markings + Alt heads + Secondary (F)Hair themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more...
 2016-10-23 19:29:54 -04:00
Crazylemon64 698782d1ad Puts the oxy KO threshold back to 50 2016-10-23 15:45:35 -07:00
Crazylemon64 be125358b3 Adds update_canmove to mob.Sleep() 2016-10-23 15:45:35 -07:00
Crazylemon64 7c8709b360 Brings over update_stat 2016-10-23 15:45:35 -07:00