cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-21 23:11:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,047 Commits 28 Branches 2 Tags
6a8035734ebd94f4555ddbca9bb8f650dabc7c13
Commit Graph

31926 Commits

Author SHA1 Message Date
Mark van Alphen
6a8035734e Maximize fire protection on Ash Drake armour 2019-04-12 19:45:49 +02:00
Mark van Alphen
246d2099ae Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/__DEFINES/misc.dm
 2019-04-12 19:44:31 +02:00
Mark van Alphen
36b74eeaea Add proper config for ruins, helm fix, selfloop Lavaland 2019-04-12 19:41:31 +02:00
Mark van Alphen
6fcd95fa50 Compile fix 2019-04-11 22:16:27 +02:00
variableundefined
19a26909dc Merge pull request #11279 from Arkatos1/Orbit 
Ghosts now orbit around their followed targets
 2019-04-11 20:41:37 +08:00
Mark van Alphen
c597c9be51 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/turfs/simulated/floor/plating.dm
#	code/modules/clothing/suits/jobs.dm
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
 2019-04-11 07:27:51 +02:00
Crazy Lemon
6c4eb66da8 Merge pull request #11282 from Fox-McCloud/atmos-defines 
Atmos Define Cleanup + Plasma Tweaks
 2019-04-10 22:18:52 -07:00
Fox McCloud
112129779c Merge pull request #11280 from Ionward/mantles 
Adds suit-slot cosmetic mantles!
 2019-04-11 00:43:29 -04:00
Mark van Alphen
69aa881c39 Flashbang fix 2019-04-11 05:32:54 +02:00
Mark van Alphen
11c5f441fd Switch back to istype 2019-04-10 21:55:44 +02:00
Mark van Alphen
f94796c125 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/items.dm
#	icons/turf/floors/plating.dmi
#	paradise.dme
 2019-04-10 21:54:54 +02:00
Ionward
54536350c7 adjusted cold protection inheritence stuff 2019-04-10 12:09:08 -07:00
variableundefined
5414aef35d Merge pull request #11267 from Arkatos1/Sling_Ability_Scaling 
Shadowling Collective Mind ability now fully scales with required thralls threshold
 2019-04-10 19:03:27 +08:00
variableundefined
09f1ca57c7 Merge pull request #11273 from Arkatos1/Guardian_phase_effect 
Adds Guardian phase in/out effect
 2019-04-10 19:02:53 +08:00
Ionward
0266c2fee2 fixed the display names in the loadout to fit alphabetical order better, and adjusted allowed list spacing 2019-04-09 21:12:25 -07:00
Ionward
4d754dde41 adjusted armor values and added options to the suit loadout menu 2019-04-09 20:49:14 -07:00
Crazy Lemon
1a57f440df Merge pull request #11257 from Fox-McCloud/nations-update 
The Nations Update Everyone Deserves!
 2019-04-09 20:47:34 -07:00
Fox McCloud
a615e2bf3c forgot this hud. 2019-04-09 23:28:19 -04:00
variableundefined
c6b8daa9b1 Merge pull request #11227 from Fox-McCloud/sr-update 
Minor Strange Reagent Tweaks
 2019-04-10 10:47:40 +08:00
Fox McCloud
e11b15fe7f Merge pull request #11270 from TDSSS/nukie-hijack 
Lets nukies buy plasmagrenades again (and other hijack gear)
 2019-04-09 22:47:26 -04:00
variableundefined
1a5b5dabe4 Merge pull request #11230 from Fox-McCloud/tweaks-crit 
Newcrit Death Tweak
 2019-04-10 10:47:02 +08:00
Fox McCloud
8a4b1691c7 Merge pull request #11277 from Arkatos1/Blob_Fix 
Shield Blobs automatically spawned around Blob Cores now give no refund
 2019-04-09 22:46:29 -04:00
variableundefined
aee2f6772e Merge pull request #11217 from Fox-McCloud/reagent-bodytemp 
Tweaks Reagent Bodytemp Interaction
 2019-04-10 10:42:31 +08:00
Fox McCloud
879b50fa10 Merge pull request #11253 from Citinited/foamedmetal-fix 
Foamed metal fixes
 2019-04-09 22:38:37 -04:00
variableundefined
9ae231ee99 Merge pull request #10327 from Fox-McCloud/fix-cqc 
Fixes and Updates CQC
 2019-04-10 10:36:44 +08:00
Fox McCloud
cf17d82c69 Merge pull request #11260 from Aurorablade/STOPBREAKINGTHISSPRITE 
Fixes cult ghost  suit sprites
 2019-04-09 22:33:38 -04:00
variableundefined
17030d02fe Merge pull request #11214 from Arkatos1/Sling_Chat 
Shadowlings now have a slightly bigger colored text when speaking in the Shadowling Hivemind
 2019-04-10 10:13:16 +08:00
Fox McCloud
1ad27bc030 more hit type verbs 2019-04-09 21:57:47 -04:00
Fox McCloud
42a6f4ef30 tweak 2019-04-09 11:32:21 -04:00
Fox McCloud
06713d604f Atmos Define Cleanup + Plasma Tweaks 2019-04-09 11:22:01 -04:00
Ionward
ba7491fa49 cleaned up and made all mantles a child of the base mantle 2019-04-09 02:54:06 -07:00
Ionward
a792d46085 adds mantles! 3 public access ones (in default clothes vendor,) and 6 command ones, each in their respective heads' lockers. 2019-04-09 01:06:19 -07:00
Arkatos1
da73c134db Ghosts now orbit their followed targets 2019-04-09 02:17:40 +02:00
Arkatos1
de61851512 Fixes refund with strong blob spawned near Core 2019-04-08 19:42:56 +02:00
Arkatos1
c4d104117b Fixed redundant effect when recalling while not manifested 2019-04-08 19:15:05 +02:00
Fox McCloud
6557082d43 changes 2019-04-07 22:21:17 -04:00
Fox McCloud
061278224b derp 2019-04-07 21:31:30 -04:00
Arkatos1
cc68b2e28f Guardian phase in/out effect 2019-04-08 02:19:46 +02:00
Fox McCloud
03d894ecfc Merge remote-tracking branch 'upstream/master' into fix-cqc 
# Conflicts:
#	code/game/objects/items.dm
 2019-04-07 19:54:14 -04:00
TDSSS
106b242770 Let's fix that too 2019-04-07 23:19:11 +02:00
TDSSS
e12653306a Thought of a better way to do it (probably 2019-04-07 23:16:54 +02:00
Crazy Lemon
b59a5d37b6 Merge pull request #11266 from Markolie/hotkeymode 
Fix Hotkey Toggle button
 2019-04-07 14:16:06 -07:00
TDSSS
6079cb1839 allows nukies to buy hijack items 2019-04-07 23:12:15 +02:00
Arkatos1
59092d9f0b Adds thrall scaling for obtaining new Shadowling abilities 2019-04-07 20:12:01 +02:00
Mark van Alphen
721760c002 Remove debug 2019-04-07 18:43:45 +02:00
Mark van Alphen
91e6cb9347 Fix hotkey mode button 2019-04-07 18:42:08 +02:00
variableundefined
7416eebf7f Merge pull request #11265 from Fox-McCloud/fix-pill-bottles 
Fixess Being Unable to Open Pill Bottles
 2019-04-07 22:12:01 +08:00
Fox McCloud
c0ca397d8a Fixess Being Unable to Open Pill Bottles 2019-04-07 09:25:45 -04:00
variableundefined
8578b6fe46 Merge pull request #11221 from Arkatos1/Destroy_Engine_Rework 
Shadowling Destroy Engines ability rework + changes to Shadowling End Round messages
 2019-04-07 21:23:43 +08:00
variableundefined
ff8dc59367 Merge pull request #11229 from Fox-McCloud/reagent-tweaks 
[Goonchem] Reagent tweaks
 2019-04-07 21:22:18 +08:00