cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 08:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,108 Commits 29 Branches 2 Tags
9d66e0e426652978eb5cd6a9c7545a6e052d5c65
Commit Graph

16464 Commits

Author SHA1 Message Date
variableundefined
855de06162 Merge pull request #10925 from Fox-McCloud/fix-blind-block 
Fixes Blindness Mutation Not Working
 2019-02-24 21:04:39 +08:00
datlo
673ecd288e antag clowns can toggle clumsy on and off 2019-02-19 20:33:36 +00:00
Fox McCloud
863a8b6bfb Fixes Blindness Mutation Not Working 2019-02-19 04:43:43 -05:00
datlo
91792b09c1 Prevent objectives from targetting offstation roles 
also remove nukie flavor text and prevent golem targetting
 2019-02-16 15:09:25 +00:00
variableundefined
f6ce6af91e Merge pull request #10898 from Mitchs98/booze 
Booze/Soda Dispenser Changes.
 2019-02-16 18:42:43 +08:00
variableundefined
4df2c24fe9 Merge pull request #10903 from farie82/why-is-this-here 
Removes some special cases for the chaplains religion
 2019-02-16 07:34:09 +08:00
variableundefined
7a3906eb95 Merge pull request #10882 from Aurorablade/ConvertFix 
Redundent cult convert checks
 2019-02-15 07:51:50 +08:00
Aurorablade
9c2ae99491 Removes isanimal check 2019-02-14 17:04:42 -05:00
variableundefined
d1ce7e6085 Merge pull request #10879 from datlo/stationdisk 
Prevent ERT/Abductors/Traders/etc from stealing dat disk
 2019-02-14 21:37:47 +08:00
variableundefined
e217ee4387 Merge pull request #10877 from TDSSS/NT-rep-access-change 
Remove HOP access from NT rep, Magistrate
 2019-02-14 21:37:22 +08:00
joep van der velden
562f8e7228 yep 2019-02-14 13:56:23 +01:00
Unknown
93b2b8ba4f Reworks Booze/Soda Dispensers slightly 2019-02-13 17:28:24 -06:00
Alex Gospodchikov
fffbe4e6f1 Made lighter size consistent 2019-02-13 18:38:54 +03:00
Aurorablade
519265503e Redundent cult convert checks 2019-02-11 15:08:43 -05:00
datlo
b538a52da5 Prevent ERT/Abductors/ETC from stealing the NAD 2019-02-11 13:09:56 +00:00
variableundefined
4dda3d4583 Merge pull request #10827 from Shadeykins/GeneticsTraits 
Removes several round-start disabilities, adds chav.
 2019-02-11 20:50:41 +08:00
variableundefined
943a21a776 Merge pull request #10818 from datlo/freegolems 
Port Mineral golems and Free Golems
 2019-02-11 20:37:07 +08:00
variableundefined
d10ac59a02 Merge pull request #10855 from Fox-McCloud/medical-pull-back 
Pulls Back Some Medical Powercreep
 2019-02-11 11:20:05 +08:00
TDSSS
fc8ea82c1b NT rep access change. 2019-02-11 03:23:23 +01:00
variableundefined
a9ce346fd2 Merge pull request #10849 from Fox-McCloud/switch-straps 
Allows Leather Satchel Strap Switching
 2019-02-10 15:46:51 +08:00
datlo
4d9bc36737 update boards name to para standard 2019-02-09 10:04:21 +00:00
variableundefined
7b5afbadc8 Merge pull request #10838 from Fox-McCloud/defib-nerf 
Reduces Defib Safe Time: Adds Health HUD Defib Indicator
 2019-02-09 13:28:43 +08:00
Fox McCloud
1ac102adec Pulls Back Some Medical Powercreep 2019-02-08 19:49:56 -05:00
Fox McCloud
d61fa732f3 Allows Leather Satchel Strap Switching 2019-02-08 16:46:07 -05:00
variableundefined
24661d2c44 Merge pull request #10833 from Kyep/ends_geezer_cheat 
Removes age-based weighting for head/captain job selection
 2019-02-08 19:36:56 +08:00
Dovixx
7938ca62b1 Update talisman.dm 2019-02-07 12:22:24 +02:00
Fox McCloud
dc09d07d86 Reduces Defib Safe Time: Adds Health HUD Defib Indicator 2019-02-07 00:49:24 -05:00
Shadeykins
3c2f36759b Readds deaf 2019-02-06 18:50:23 -07:00
Kyep
420ff9f540 prevent possible really rare runtime 2019-02-06 04:39:24 -08:00
Kyep
3a530cb039 remove all age-based weighting in head job selection 2019-02-06 04:37:54 -08:00
Kyep
84451f8e48 Reduces captain ageism 2019-02-06 04:26:37 -08:00
Shadeykins
fffe081a8f Adjusts restrictions to remove deprecated options. 2019-02-04 20:58:34 -07:00
datlo
481208ae9c add robo access, space cleaners, fix bana golem bug 2019-02-05 02:51:40 +00:00
datlo
0358bfef42 fix bugs, remove cult free golems 2019-02-04 13:11:11 +00:00
datlo
4ca61d45de Update vendor items, update map for botany/xenobio 2019-02-04 02:10:40 +00:00
datlo
cf1a95dabc fix config options 2019-02-04 00:21:13 +00:00
datlo
605bad8417 actually compiles *scream 2019-02-03 19:35:44 +00:00
datlo
ad44e6f2a2 fix compile error 2019-02-03 19:11:50 +00:00
datlo
0ff947ec17 Added golem custom access, boards, and a free KA 
You must mine for the trigger guard kit before being able to use the KA
 2019-02-03 18:27:24 +00:00
datlo
e9e2d1a2e9 add ID registering 2019-02-03 16:59:59 +00:00
datlo
912c6b0b9e asteroid claim improvements, golem ship security 
Add plating over asteroid tiles if you've claimed them

Asteroid walls can now be used to define rooms (still must be airtight)

Add golem check to the free golem ship
 2019-02-03 15:59:04 +00:00
datlo
f06e88d82d Remove base access from golem ID, buff golem KA 2019-02-03 14:35:11 +00:00
datlo
224f32bab3 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into freegolems 2019-02-03 06:41:02 +00:00
datlo
74a3631741 compilin and mostly workin 
has runtimes due to body color
need to wrap up commented procs
 2019-02-03 06:40:50 +00:00
taukausanake
b7ce683ab1 Merge branch 'pai_light' of https://github.com/Tayyyyyyy/Paradise into pai_light 
Conflicts:
	code/game/gamemodes/shadowling/shadowling_abilities.dm
	code/game/objects/items/devices/flashlight.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/robot.dm

 Changes to be committed:
	modified:   code/game/gamemodes/shadowling/shadowling_abilities.dm
	modified:   code/game/machinery/computer/computer.dm
	modified:   code/game/machinery/floodlight.dm
	modified:   code/game/objects/items/devices/flashlight.dm
	modified:   code/game/objects/items/devices/paicard.dm
	modified:   code/modules/clothing/head/hardhat.dm
	modified:   code/modules/clothing/spacesuits/hardsuit.dm
	modified:   code/modules/clothing/spacesuits/plasmamen.dm
	modified:   code/modules/lighting/lighting_atom.dm
	modified:   code/modules/mob/living/carbon/human/human.dm
	modified:   code/modules/mob/living/living.dm
	modified:   code/modules/mob/living/silicon/pai/pai.dm
	modified:   code/modules/mob/living/silicon/pai/software_modules.dm
	modified:   code/modules/mob/living/silicon/robot/robot.dm
	modified:   code/modules/pda/PDA.dm
	modified:   code/modules/power/lighting.dm
	modified:   code/modules/projectiles/gun.dm
 2019-02-02 22:53:46 -06:00
variableundefined
7bc5c9fc0c Merge pull request #10812 from Fox-McCloud/no-cure 
Ensures Some Diseases Cannot Be Cheesed
 2019-02-03 08:22:44 +08:00
Fox McCloud
01d20eb7af Ensures Some Diseases Cannot Be Cheesed 2019-02-02 17:50:05 -05:00
datlo
f98da3edf8 Progress... 2019-02-02 17:51:25 +00:00
variableundefined
58e3c95c81 Merge pull request #10778 from MINIMAN10000/helpful-push 
Mobs on help intent no longer push structures or mobs that are pulling structures
 2019-02-02 21:05:00 +08:00
Kyep
00187ad971 Updates show player playtime report 2019-02-01 23:46:29 -08:00