cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-14 19:41:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,143 Commits 27 Branches 2 Tags
aec7bcc64d228287db5317f89b1ea3327a2c19be
Commit Graph

16775 Commits

Author SHA1 Message Date
Mark van Alphen
09da967bd1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	_maps/map_files/RandomZLevels/moonoutpost19.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm
 2019-04-18 03:15:52 +02:00
variableundefined
6125d73d64 Merge pull request #11314 from farie82/windoor-fix 
Fixes windoors not spawning electronics once deconstructed
 2019-04-18 07:51:13 +08:00
variableundefined
91da0c75a2 Merge pull request #11317 from farie82/cult-rune-scribe-fix 
Can't place runes in space anymore
 2019-04-18 07:50:35 +08:00
variableundefined
31a2779bae Merge pull request #11259 from Markolie/flukeops 
Nuke Ops updates and buffs
 2019-04-18 07:16:31 +08:00
Mark van Alphen
6faf9c769f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
#	paradise.dme
 2019-04-17 22:46:43 +02:00
joep van der velden
c567e6d1cd Can't place runes in space anymore 2019-04-17 13:14:47 +02:00
joep van der velden
11abbd1ef2 Fixes windoors not spawning electronics once deconstructed 2019-04-17 12:09:20 +02:00
variableundefined
0bc6859d7e Merge pull request #11305 from Fox-McCloud/its-time 
It's Time
 2019-04-16 19:48:20 +08:00
variableundefined
eb83a2dee7 Merge pull request #11285 from Fox-McCloud/elecrocution-refactor 
Refactors Electrocution
 2019-04-16 19:47:42 +08:00
variableundefined
546bd0edf5 Merge pull request #11288 from Fox-McCloud/toxins-remap 
Remaps Toxins
 2019-04-16 19:47:14 +08:00
variableundefined
b6c1026d74 Merge pull request #11297 from Fox-McCloud/update-gas-overlay 
Updates and Fixes Gas Overlays and Icy Floor Change
 2019-04-16 19:45:51 +08:00
variableundefined
dc825a7bfa Merge pull request #11231 from Arkatos1/Tips 
Adds Tip of the round + Show Custom Tip admin verb + Give Random Tip OOC verb
 2019-04-16 19:43:55 +08:00
CornMyCob
1af7999dbd lighting fix 2019-04-15 20:45:16 +01:00
Fox McCloud
7f00f8313a It's Time 2019-04-14 18:24:48 -04:00
Mark van Alphen
a9fa2f32e1 Remove infinite claw sharpening 2019-04-15 00:01:08 +02:00
Fox McCloud
964bf03697 icy floors 2019-04-13 04:44:25 -04:00
Fox McCloud
6334114f8c Updates and Fixes Gas Overlays 2019-04-13 01:44:05 -04:00
Mark van Alphen
1750d0b900 Change Syndicate Base DonkSoft vending machine to Syndicate appearance and Seed Vault fix 2019-04-13 03:25:33 +02:00
Fox McCloud
58a7107eae shocking animals 2019-04-12 16:03:18 -04:00
Fox McCloud
93118f9d34 Remaps Toxins 2019-04-11 07:24:16 -04: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
Fox McCloud
90c9f3f479 Refacors Electrocution 2019-04-10 18:09:14 -04: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
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
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
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
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
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
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
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
Mark van Alphen
c7b4179e46 Make reinforcements spawn with basic gear and 0 telecrystals 2019-04-08 19:10:10 +02:00
Arkatos1
b20e545a70 Finishing touches 2019-04-08 18:54:58 +02: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
Mark van Alphen
c33868440e Rmoeve unused variables 2019-04-07 23:07:30 +02:00
Mark van Alphen
f63b587f54 Nuke ops updates 2019-04-07 21:57:22 +02:00
Arkatos1
59092d9f0b Adds thrall scaling for obtaining new Shadowling abilities 2019-04-07 20:12:01 +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