cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-16 08:37:41 +01:00
Code Issues Packages Projects Releases Wiki Activity
25,332 Commits 17 Branches 2 Tags
efbe3618530f4f2ec69fbd8a45aaf330d48181b5
Commit Graph
11837 Commits
Author SHA1 Message Date
Fox McCloud efbe361853 Merge pull request #3149 from DaveTheHeadcrab/friendlyfire 
Adds Fun
 2016-01-08 15:13:24 -05:00
Fox McCloud aa6e5d8e8a Merge pull request #3161 from Tastyfish/observervation 
Interrogation Observervation & some emote pronoun fixes
 2016-01-08 15:06:35 -05:00
Fox McCloud 05c68fa9ef Merge pull request #3143 from Crazylemon64/i_hate_fun 
Makes everything terrible
 2016-01-08 14:03:32 -05:00
Tastyfish 0a9389e51a Fixed some emotes to handle pronouns correctly 2016-01-08 09:17:19 -05:00
Fox McCloud 6f70f7790f Merge pull request #3139 from DaveTheHeadcrab/idedplsnerf 
Tweaks .38 Rubber Bullet Damage
 2016-01-08 00:44:39 -05:00
SamCroswell 0b69e3dfd7 I submit to overlord Fox! 2016-01-08 00:40:51 -05:00
TheDZD bbcac90906 Merge pull request #3135 from Fox-McCloud/timestop 
Timestop Spell Port and Sepia Slimes
 2016-01-07 19:56:45 -05:00
TheDZD f5f90c720b Merge pull request #3154 from Fox-McCloud/damage-fix 
Fixes Take Overall Damage
 2016-01-07 19:56:27 -05:00
TheDZD 8c438d84d4 Merge pull request #3150 from Fox-McCloud/strange-reagent-fix 
Strange Reagent Fix
 2016-01-07 19:56:22 -05:00
Fox McCloud fd2e2c3649 Merge pull request #3133 from KasparoVy/Vox-Masks 
Vox Mask Additions+Adjustments, Removes Duplicate Human Balaclava
 2016-01-07 19:53:05 -05:00
Fox-McCloud b5af35f7d0 Fixes Take Overall Damage 2016-01-07 19:27:54 -05:00
Fox-McCloud d6caea6aa0 Strange Reagent Fix 2016-01-07 16:16:45 -05:00
SamCroswell 96f7f48f32 Properly spells magazine 2016-01-07 15:17:44 -05:00
SamCroswell eb8b2cc09f Adds Fun 2016-01-07 15:08:12 -05:00
Crazylemon64 0a91b351c0 SSD people fall asleep more reliably 2016-01-07 09:05:52 -08:00
Crazylemon64 e6842e216a Fun is the worst, don't have it ever 2016-01-07 00:28:40 -08:00
Fox McCloud 840c519321 Merge pull request #3131 from FalseIncarnate/master 
Plant Age, Weeds, and Pest Tweaks
 2016-01-07 00:17:15 -05:00
SamCroswell 68cfea1e7c Reduces Detective's Revolver Damage 2016-01-06 21:43:09 -05:00
Fox-McCloud c09fcb6e14 Pshhhooooommmmm 2016-01-06 15:40:04 -05:00
Tigercat2000 75659a2654 Merge remote-tracking branch 'upstream/master' into I_KEEP_MAKING_FEATURES_HELP 
Conflicts:
	nano/assets/nanoui.css
	nano/styles/_lists.less
 2016-01-06 07:44:24 -08:00
Fox-McCloud f641cc2710 balance 2016-01-06 03:40:36 -05:00
Fox-McCloud ebdd9d3897 Timestop Spell Port and Sepia Slimes 2016-01-06 03:30:08 -05:00
KasparoVy 99adf343e8 Adds New Vox Masks and up-State Sprites, Adjusts Existing up-State Sprites, Removes Duplicate Sprite 
**Adds:**
* Vox Security gasmask.
* Vox Sexy Mime mask.
* All Bandanas for Vox.
* Balaclava + up state.
* Welding gas mask + up state.
* All Wrestling masks for Vox.
* Up state sprites for Vox Breath, Medical and Surgical masks.

**Removes:**
* Duplicate of the up state for the balaclava in the human masks.dmi

**Tweaks:**
* Vox plague-doctor mask, now fits Vox anatomy.
* Vox fake moustache, now appears in the correct location.
* Vox Sterile/Surgical mask sprite, now fits Vox anatomy.
* Vox Medical mask sprite, now fits Vox anatomy.
 2016-01-06 00:50:10 -05:00
Fox McCloud 14982126db Merge pull request #3132 from Tastyfish/blueshield-is-not-sec 
Fixed blueshield mission briefing
 2016-01-06 00:04:41 -05:00
Tastyfish 61d120737a Blueshield briefing had wrong position as their boss 2016-01-05 22:16:45 -05:00
FalseIncarnate f36efd3a4a Plant Age, Weeds, and Pest Tweaks 
Makes plants die when they get old again.
- Plants begin dying once they age past 5 times their TRAIT_MATURATION
value.
- This means a plant with TRAIT_MATURATION 5 will begin dying when it
reaches age 26 and higher
- Plant death will occur over time as it loses health each process.
- Can be slightly deferred with health restoring reagents, but is
unavoidable in the long run.

Weed growth in trays has been returned to pre-#980 chances.
- Chance for weedLevel to increase is 6% if no seed planted, 3%
otherwise
- With #980, this was unintentionally dropped to 5% / 1%

Pest growth in trays has received a buff
- Now a 5% chance per process to increase pestLevel by 0.5
- Previously was 3% chance to increase by 0.1
- Pre-#980, this was a 3% chance to increase by 1.0
 2016-01-05 22:10:10 -05:00
TheDZD 3d316d9c66 Merge pull request #3116 from Fox-McCloud/slipping-floors 
Slippery Refactor and Floors
 2016-01-05 21:42:26 -05:00
TheDZD 34901c8664 Merge pull request #3125 from Fox-McCloud/typo-fixes 
Fixes a Few Vulp Typo's
 2016-01-05 20:20:37 -05:00
Fox-McCloud 44fe321366 cleaner 2016-01-05 20:14:10 -05:00
Fox-McCloud 9478fc078c Fixes a Few Vulp Typo's 2016-01-05 19:39:19 -05:00
TheDZD ebdbe4627b Merge pull request #3114 from Fox-McCloud/chem-master 
Constructable Chem Master
 2016-01-05 19:36:11 -05:00
TheDZD 750d555ff0 Merge pull request #3107 from Fox-McCloud/vox-tails-vulp-markings 
Vox Tail and Vulp Markings
 2016-01-05 19:35:34 -05:00
TheDZD 4dd3cd76bf Merge pull request #3085 from Fox-McCloud/sec-rifle 
Sec Rifle Port
 2016-01-05 19:34:33 -05:00
Tigercat2000 ef5c90e120 NanoUI Upgrades: FontAwesome, Bower, Minified CSS 2016-01-05 07:41:10 -08:00
Fox McCloud 67f704d235 Merge pull request #3119 from Crazylemon64/simple_animals_sleeping 
Simple animals will now tick down sleeping
 2016-01-05 02:37:37 -05:00
Fox-McCloud 38ee27898b structuring 2016-01-05 01:34:16 -05:00
Crazylemon64 3a3f0f56c4 Simple_animals now tick down sleeping, so relogging doesn't cause deaf 2016-01-04 21:48:03 -08:00
Fox McCloud d9520c4327 Merge pull request #3105 from Crazylemon64/guess-we-didn't-need-it 
Removes that conversion proc we didn't actually use
 2016-01-05 00:46:12 -05:00
Crazylemon64 2f642e6d75 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into simple_animals_sleeping 2016-01-04 21:44:27 -08:00
Fox-McCloud 447be6f9fd binsult.ogg 2016-01-05 00:41:46 -05:00
TheDZD 068a42b8f1 Merge pull request #3108 from Fox-McCloud/shock-fix 
Fixes Shock Explosion Oversight
 2016-01-04 22:03:14 -05:00
Fox-McCloud 550aef34ba less copy-paste 2016-01-04 21:54:47 -05:00
Fox-McCloud 4221d033ab Slipping Refactor and Floors 2016-01-04 21:22:59 -05:00
Fox-McCloud 51851e9ec5 Constructible Chem Master 2016-01-04 18:23:41 -05:00
Crazylemon df224e81d6 Simple animals will now tick down sleeping 2016-01-04 13:47:36 -08:00
Crazylemon 855b2f7f61 Summoned guardians will vanish without a master 2016-01-04 07:01:36 -08:00
Fox-McCloud 1f16068970 Fixes Shock Explosion Oversight 2016-01-04 07:46:45 -05:00
Fox-McCloud 59a3a5281e Vox Tail and Vulp Markings 2016-01-04 02:10:47 -05:00
Crazylemon 01fd2e0f7b Removes that conversion proc we didn't actually use 2016-01-03 21:43:59 -08:00
FalseIncarnate a358291d83 EMERGENCY PASTE REMOVAL 
Copy-paste struck again!
 2016-01-04 00:00:50 -05:00