cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-20 10:37:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,890 Commits 17 Branches 2 Tags
0c637cebfa74b959798cabf76d161506fb897a1d
Commit Graph
7096 Commits
Author SHA1 Message Date
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
Crazylemon64 8a6db8891f Fox's requests 2016-10-23 15:45:35 -07:00
Crazylemon64 6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07:00
Fox McCloudandGitHub 656a04ce3e Merge pull request #5805 from Scribblon/pAIAtmosFix 
Fix for pAI Atmosphere Sensor
 2016-10-23 17:22:05 -04:00
Fox McCloudandGitHub c2b1de4499 Merge pull request #5807 from Markolie/sansfix 
Fix Comic Sans HTML parsing
 2016-10-23 17:21:20 -04:00
Markolie 79be3ca8cf Fix up a number of ID checks 2016-10-23 15:49:02 +02:00
Markolie 199f6d91f1 Fix sans HTML parsing 2016-10-23 02:24:53 +02:00
Scriblon db8d5ce158 Fix pAI Atmosphere Sensor 
The problem was that in the old code, data["pressure"] was stored as a
String to round it. While NanoUI was programmed to use
helper.smoothRound() on that again which didn't like the String Object
pressure became.
As all data is integers and rouned in the UI, the fix chosen is to make
data["pressure"] a number again.
 2016-10-22 21:05:40 +02:00
Markolie 010fa7d60f Alien attack and organ fixes 2016-10-21 17:51:55 +02:00
Markolie 7173a8fe9f Fix aliens double attacking, tank examining and ATM security level 0 interaction 2016-10-21 17:21:23 +02:00
Markolie e853b66747 Minor wall deconstruction refactor 2016-10-21 17:05:49 +02:00
FlattestGuitar 8229592986 fixes fixes 2016-10-18 20:20:47 +02:00
Markolie 268fbf4ffd Drone emote fix 2016-10-15 12:28:10 +02:00
Markolie cc780dcdf3 Fix traitors/operatives/mindslaves losing their status upon reconnect 2016-10-13 19:49:42 +02:00
Aurorablade 78eb685ac6 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-12 20:25:48 -04:00
TheDZDandGitHub 810f2adfb4 Merge pull request #5685 from Fox-McCloud/alert-fixes 
Fixes Alert Images
 2016-10-10 20:38:07 -04:00
Fox McCloudandGitHub ce04590e25 Merge pull request #5752 from Markolie/antaghud 
AntagHUD fixes
 2016-10-10 20:24:42 -04:00
Fox McCloudandGitHub 1525b0c019 Merge pull request #5760 from Markolie/nukefinish 
De-snowflakes Dronespeak
 2016-10-10 20:21:06 -04:00
Markolie 92bc8350ad Handle Drone radio 2016-10-10 23:54:16 +02:00
Markolie 4528e4d469 De-snowflakes Dronespeak 2016-10-10 23:42:31 +02:00