cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-11 14:21:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,724 Commits 17 Branches 2 Tags
dependabot/github_actions/actions/setup-python-7.0.0
Commit Graph

4852 Commits

Author SHA1 Message Date
Mark van Alphen e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
Mark van Alphen 0d73736be2 Make the traitor reviver implant EMP-proof 2019-05-01 02:34:16 +02: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
Mark van Alphen ad2238f496 Merge branch 'master' into lighting 2019-04-30 19:15:58 +02:00
AffectedArc07 ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
variableundefined c8d890ef8a Merge pull request #11365 from Kyep/id_card_tracking 
Upgrades ID Computer
 2019-04-30 13:28:03 +08:00
variableundefined 0fb9167060 Merge pull request #11312 from farie82/cure-text 
Makes the crit cure texts clearer
 2019-04-29 22:58:59 +08:00
Couls fff65f34ca Code cleanup time! 2019-04-27 20:42:31 -04:00
Mark van Alphen 36d251574f Add planetary atmos 2019-04-27 18:52:50 +02: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
Mark van Alphen e4dd9110ee Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	paradise.dme
 2019-04-26 22:58:56 +02:00
Couls a8db26df98 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-04-25 23:45:08 -04:00
Kyep 3ef424eb5c upgrades ID computer 2019-04-23 21:02:27 -07: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
Couls 4921405749 make clients inherit from datums 2019-04-23 19:55:17 -04:00
Mark van Alphen 045311ae84 Merge branch 'ambientocclusion' of https://github.com/Markolie/Paradise into lighting 2019-04-23 22:59:11 +02:00
Mark van Alphen 0d883a5b88 Darkness handling update 2019-04-23 22:59:00 +02:00
Mark van Alphen 429dd20ded Button plane fix 2019-04-23 20:08:04 +02:00
variableundefined 624699e6d9 Merge pull request #11332 from Arkatos1/VarArts 
Adds an option to grant Martial Arts via Var menu
 2019-04-23 20:47:03 +08:00
Couls 09ba03857b Remove repeat defines and fix focus 2019-04-23 06:27:21 -04:00
Couls 40729f2862 spessing and fix compile errors 2019-04-23 02:01:57 -04:00
Couls 7eb7d723f9 Implement keybinding system and remove old hotkey modes 2019-04-23 01:31:03 -04:00
Fox McCloud 4761ded0d4 Merge pull request #11350 from AffectedArc07/ss-everything 
Gives the orphans a home
 2019-04-21 18:44:38 -04:00
AffectedArc07 ff78ff1a9c SScommunications 2019-04-21 20:12:14 +01:00
Mark van Alphen c878f8e36e Lavaland code review fixes - also integrates flyswatter and cat toy 2019-04-20 00:24:58 +02:00
Mark van Alphen 5452d4e8df Processing fix 2019-04-19 19:28:55 +02:00
Mark van Alphen d9be6c5a1a Code review changes 2019-04-19 19:12:21 +02:00
Arkatos1 cb8e492746 Code improvement 2019-04-19 17:41:25 +02:00
Arkatos1 b0182639b2 Adds an option to grant Martial Arts via Var menu 2019-04-19 16:54:59 +02:00
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 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 1c21b625af Makes the crit cure texts clearer 2019-04-17 10:49:31 +02:00
variableundefined eb83a2dee7 Merge pull request #11285 from Fox-McCloud/elecrocution-refactor 
Refactors Electrocution
 2019-04-16 19:47:42 +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 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
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
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
Fox McCloud 06713d604f Atmos Define Cleanup + Plasma Tweaks 2019-04-09 11:22:01 -04: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
Mark van Alphen ddc3a02ab3 Fix thermal for saboteur, reinforcement bugfix, re-add C4 pack 2019-04-07 23:04:43 +02:00
Mark van Alphen 16dd2860f4 Remove debug and re-add spawning as a cyborg 2019-04-07 22:42:04 +02:00