cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-23 08:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,527 Commits 26 Branches 2 Tags
288af9f92cb15d93b0956a8b32b2f47ebb0dfd93
Commit Graph

22686 Commits

Author SHA1 Message Date
TheDZD
33a24723c2 Merge pull request #4197 from Fox-McCloud/glasses-fix 
Fixes Prescription Glasses
 2016-04-14 15:44:13 -04:00
Mieszko Jędrzejczak
63470e0c71 I'm bad at inventive descriptions 2016-04-14 21:27:59 +02:00
Mieszko Jędrzejczak
7888adf6c5 Better desc ;) 2016-04-14 21:12:38 +02:00
Fox-McCloud
42c7e41e9a Merge remote-tracking branch 'upstream/master' into dna-injector-refactor 2016-04-14 14:57:00 -04:00
Mieszko Jędrzejczak
4692f3f0a4 Shoots glasses 2016-04-14 20:54:02 +02:00
Mieszko Jędrzejczak
6b72a889e6 Shot glasses 2016-04-14 20:53:47 +02:00
Fox-McCloud
e6d78c7c60 fix and cancelling 2016-04-14 14:51:25 -04:00
Crazylemon64
880056a87d Adds granted and denied stamps to the bureaucracy crate 2016-04-14 08:22:37 -07:00
Fox-McCloud
7e4ef50da9 DNA Injector Partial Refactor 2016-04-14 07:49:18 -04:00
Fox McCloud
ad126c11f9 Merge pull request #4200 from VampyrBytes/FixesDNAModifier 
Fixes DNA Modifier using refs instead of copies
 2016-04-14 06:26:35 -04:00
VampyrBytes
049b5165c5 Fixes DNA Modifier using refs instead of copies 
fixes #4193

Transfer button and block injectors now make copies instead of using
references
 2016-04-14 10:55:55 +01:00
Fox-McCloud
3e68373831 Drinking Glass Sprites In-Hand 2016-04-14 05:08:04 -04:00
Fox-McCloud
4e04570a12 Remove Dropper Copy-Paste 2016-04-14 04:27:16 -04:00
Fox-McCloud
d2827a4196 Fixes Prescription Glasses 2016-04-14 03:55:50 -04:00
HugoLuman
56ec95fe00 New color, Regen refactor 
Regen tiers all shifted up by one
Previous tier 3 rates now tier 4, even harder to reach
Drask language now has its own color
(Bugged commits retconned)

Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-04-14 00:15:40 -07:00
HugoLuman
498e243f0f Drask burn_mod down from 4 to 2. Now it takes 5 laser shots to kill them, or 8 welder hits 
Regen values altered to reflect that change in the maths:
Tier 3 regeneration: 10 brute and 10 burn per breath (once every four seconds)
Tier 2 regeneration: 6 brute and 6 burn per breath
Tier 1 regeneration: 3 brute and 3 burn per breath
Tier 3 regeneration now requires an upgraded freezer to get internals cold enough
hot_env_multiplier = 2 added

Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-04-13 20:07:00 -07:00
Fox-McCloud
cd02ee9a05 remote view nerf 2016-04-13 22:06:06 -04:00
Fox-McCloud
9005622ea7 Genetics Fixes and Tweaks 2016-04-13 21:21:52 -04:00
HugoLuman
4d0792e020 Gives Drask skin tone and makes it choosable in the character menu 
Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-04-13 15:23:55 -07:00
TheDZD
b0fd688ed5 Merge pull request #4190 from Meisaka/fix-law 
Fix Malf Law in Law manager
 2016-04-13 16:24:57 -04:00
TheDZD
7e30d13c06 Merge pull request #4174 from Fox-McCloud/blind-fix 
Fixes Blind Player Preference Doing Nothing
 2016-04-13 16:23:04 -04:00
Meisaka Yukara
80b8aee935 Replace format code 2016-04-14 03:21:23 +09:00
Fox-McCloud
81ed1467d7 Xenobio Additions 2016-04-13 01:50:11 -04:00
Fox-McCloud
cff3b9e7c6 more unsnowflaking 2016-04-13 00:47:44 -04:00
Fox-McCloud
5081e6d892 Diona Refactor 2016-04-12 23:54:12 -04:00
HugoLuman
f6c48c187e Removes commented-out and unused code from organ files, removes pointless can_revive_by_healing from drask.dm 
Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-04-12 20:19:56 -07:00
HugoLuman
afc46b0b9d No more color macros, clean compile 
Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-04-12 20:03:00 -07:00
HugoLuman
b95cdecb89 Fixes merge conflict 
Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-04-12 19:26:34 -07:00
HugoLuman
71ad25c01c Merge branch 'Paradise-drask' of https://github.com/QuinnAggeler/Paradise into Paradise-drask 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/drask.dm
#	code/modules/surgery/organs/subtypes/drask.dm
 2016-04-12 19:16:57 -07:00
HugoLuman
03323686d4 Drask files 
Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-04-12 19:00:29 -07:00
HugoLuman
46bd72ac5e Drask files 
Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-04-12 18:06:35 -07:00
Fox McCloud
1d030c5824 Merge pull request #4182 from pinatacolada/rolldown 
Fixes #4181
 2016-04-12 20:14:30 -04:00
monster860
198bcd384d travis 2016-04-12 17:53:54 -04:00
monster860
c769b14158 lien nutes 2016-04-12 17:44:44 -04:00
pinatacolada
b9b0b3d58f Fixes #4181 2016-04-12 16:06:27 +01:00
Fox-McCloud
4609413c7e Adds some Hydro Items to Autolathe and R&D 2016-04-12 03:58:53 -04:00
Fox-McCloud
d6f33a0127 tweak 2 2016-04-12 03:34:00 -04:00
Fox McCloud
d5c95892f6 Merge pull request #4146 from Aurorablade/Stupideyes 
I HATE EYEBALLS
 2016-04-12 03:29:24 -04:00
Fox McCloud
f923c3d4ff Merge pull request #4153 from pinatacolada/sop-books 
Adds SOP books
 2016-04-12 03:29:03 -04:00
Fox McCloud
1097f66ecb Merge pull request #4165 from Tastyfish/sdql-update 
More SDQL Insanity
 2016-04-12 03:27:11 -04:00
Fox-McCloud
e1d057ab0e Fixes Blind Player Preference Doing Nothing 2016-04-12 03:21:39 -04:00
KasparoVy
41684a577c Fixes Issue With Head Accessories 
Vulpkanin facial markings and Unathi horns will no longer magically
disappear when you wear something that hides hair. Now works in the same
manner as facial hair, being persistent

Fixes an issue where the facial markings of Vulpkanin and the horns of
Unathi Surgeons would disappear when they wore their surgical cap (i.e.
at spawn) and not regenerate without two triggers
 2016-04-12 02:08:31 -04:00
Fox-McCloud
49f59234e6 tweaks 2016-04-11 22:24:35 -04:00
Fox McCloud
1d04645730 Merge pull request #4145 from Tastyfish/snpcs 
Ports SNPCs
 2016-04-11 20:44:50 -04:00
Fox McCloud
dab1303d46 Merge pull request #4150 from Tastyfish/away-reorder 
Updates maploader code to be in line with tg's, startup improvements
 2016-04-11 19:41:22 -04:00
Fox McCloud
f4df310f1d Merge pull request #4166 from Tastyfish/mulehouse 
Fixes MULEs not coming out of their shell.
 2016-04-11 19:29:04 -04:00
Fox McCloud
62b57d4cbf Merge pull request #4155 from Tastyfish/bruh 
Makes cans crushable by humans and janiborgs
 2016-04-11 18:44:17 -04:00
Tastyfish
a298ca044a Fixes function call with lists 2016-04-11 16:29:20 -04:00
Tastyfish
68b936f0e1 Fixes girder animal smash messages 2016-04-11 13:51:31 -04:00
pinatacolada
b30b826e21 forgot legal and standard sop oops 2016-04-11 16:10:05 +01:00