cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-18 01:26:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
47,237 Commits 17 Branches 2 Tags
073fefd8564187706ec56f85229bf659d3b7e756
Commit Graph
351 Commits
Author SHA1 Message Date
Arvenius169 5d04a210fc "DEVASTATION", not "DEVESTATION" 
"Devestation" is pronounced "deev-station".
 2020-01-12 12:01:42 -05:00
AffectedArc07andvariableundefined f9171913c8 Runtime Transparency (#12886) 2020-01-07 14:46:09 -05:00
Fox McCloudandvariableundefined d6a6debf94 Traits framework (#12548) 2019-10-15 20:12:46 -04:00
Fox McCloudandvariableundefined cc151278d5 Removes Unfinished VR (#12341) 2019-09-20 17:58:41 -07:00
Fox McCloudandvariableundefined ce1b8c76e5 Updates Space Carp (#12322) 2019-09-17 13:44:24 -04:00
variableundefinedandGitHub e593075332 Merge pull request #12248 from Fox-McCloud/taste-fixes-tweaks 
Fixes Some Tastes; Tweaks a Few
 2019-09-10 19:38:56 -04:00
variableundefinedandGitHub d649eaf378 Merge pull request #12240 from Fox-McCloud/turf-mineral-lava-update 
Lavaland Update Part 3: Fixes Megafauna Spawning, Rivers, and Turfs
 2019-09-10 07:54:08 -04:00
Fox McCloud cdd5190e36 Fixes Some Tastes; Tweaks a Few 2019-09-09 17:47:26 -04:00
Fox McCloud 5d50935f31 Lavaland Update Part 3: Mob Spawning, Rivers, and Turfs 2019-09-09 01:34:02 -04:00
Fox McCloud fde5769225 other vending machines 2019-09-08 10:59:04 -04:00
Coul 6b82bfe47d Merge remote-tracking branch 'upstream/master' into zombies 2019-09-03 15:52:43 -04:00
Fox McCloud a4f187ac38 Adds Book of Babel and Jacob's Ladder 2019-08-27 16:04:54 -04:00
FreeStylaLT 6fda029db8 conflicts 2019-08-14 14:19:33 +03:00
variableundefinedandGitHub c8e0dee631 Merge pull request #11735 from AffectedArc07/panic-bunker 
Panic Bunker
 2019-08-12 19:34:19 +08:00
Couls 6ee8c0d96f Merge remote-tracking branch 'upstream/master' into zombies 2019-08-04 21:05:10 -04:00
FreeStylaLT 2a0a0769b0 spacing and fixes the spam-self-attack exploit with the picker 2019-08-02 18:19:56 +03:00
FreeStylaLT 7153552297 Magic strings to defines, adds a GLOB list for the beacons 2019-08-02 17:40:37 +03:00
variableundefinedandGitHub 8d57a2f736 Merge pull request #11605 from Couls/disease-rework 
rework disease outbreak event
 2019-07-09 18:24:38 +08:00
AffectedArc07 fec44e72a9 Panic Bunker 2019-06-21 16:23:21 +01:00
Couls a5f510b176 rework disease outbreak event 2019-05-27 13:54:57 -04:00
Mark van Alphen ef479cb982 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/feet.dmi
#	paradise.dme
 2019-05-23 19:04:09 +02:00
AffectedArc07 513c926cb1 Come on you need friends 2019-05-19 20:36:58 +01:00
Couls 8083b51a96 Initial commit 2019-05-16 22:36:30 -04:00
Mark van Alphen 0f98a95666 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-05-13 22:14:38 +02:00
AffectedArc07 510c210930 Merge 2019-05-09 17:06:35 +01:00
Mark van Alphen d98eb14a39 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
#	code/modules/shuttle/shuttle.dm
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-05-04 03:16:38 +02:00
variableundefined 6e79364b65 Here we go again 2019-05-03 21:47:07 +08:00
AffectedArc07 bdc5452609 Globalise this 2019-04-30 21:12:09 +01:00
Mark van Alphen ba0f6abb02 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/items.dm
#	code/modules/power/cable.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	icons/obj/lighting.dmi
#	paradise.dme
 2019-04-30 19:26:17 +02:00
variableundefinedandGitHub 32376093cb Merge pull request #11393 from Fox-McCloud/powernet-refactor 
TG Powernet Refactor
 2019-04-30 12:42:53 +08:00
Kyep 6e145e208f save space, 'paracode', let byond handle playercount, -discord/-forum 2019-04-29 17:34:06 -07:00
Fox McCloud d0a077f9d5 Powernet Refactor 2019-04-27 02:06:04 -04:00
Mark van Alphen 4423962a2a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/controllers/subsystem/mapping.dm
#	paradise.dme
 2019-04-26 23:07:57 +02:00
Fox McCloud 0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Mark van Alphen ccef4d1187 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-04-24 02:55:32 +02:00
AffectedArc07 563a951975 SSevents & SSholiday 2019-04-23 10:55:36 +01:00
Mark van Alphen 092773132d no_lava fix, make sure simple explosions don't nuke the Syndicate base 2019-04-20 03:09:13 +02: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
Fox McCloud 6334114f8c Updates and Fixes Gas Overlays 2019-04-13 01:44:05 -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
Fox McCloud 8446632fbc The Nations Update Everyone Deserves! 2019-04-06 20:30:04 -04:00
Mark van Alphen 99c470531f Add Swarmer megafauna/ruin, refactor medals so it's a subsystem. The catwalk's not yet functional 2019-04-04 17:43:15 +02:00
AffectedArc07andGitHub ce34a6ccb1 Merge branch 'master' into prisonconsole-fixed 2019-03-16 17:54:31 +00:00
Aurorablade 238b73121f Asset logging 2019-03-14 00:42:17 -04:00
AffectedArc07 13c26d716c Uses a list instead of world search 2019-03-09 10:31:36 +00:00
variableundefinedandGitHub 459228a81c Merge pull request #10836 from datlo/navconsoles2 
Revives Shuttle Navigation Computers to all syndicate shuttles + Vox/ERT
 2019-02-27 22:26:08 +08:00
Citinited 843a41622d Adds jestosterone to standard reagents list 2019-02-13 18:43:13 +00:00
datlo c57ec440e1 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into navconsoles2 
# Conflicts:
#	code/modules/shuttle/shuttle.dm
 2019-02-11 13:31:37 +00:00
datlo 91ef2d7be2 it's alive 2019-02-06 20:01:30 +00:00
datlo 0358bfef42 fix bugs, remove cult free golems 2019-02-04 13:11:11 +00:00