cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 14 Branches 2 Tags
dev-docs-readme
Commit Graph
4369 Commits
Author SHA1 Message Date
Shadeykins cfee68f41b Typo. 
Wellbeing -> well-being
 2019-05-03 11:07:04 -06:00
Shadeykins 6a65e92eb1 Some typos. 
crewmember -> crew member
 2019-05-03 11:06:20 -06:00
Shadeykins d7930d2e55 Reworks Corporate and adjusts NT Default. 
A few changes based off suggestions.
 2019-05-03 10:58:32 -06:00
Mark van Alphen 35b1cee88b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/obj/toy.dmi
 2019-05-03 18:31:45 +02:00
Mark van Alphen d646ab0934 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	code/game/area/Space Station 13 areas.dm
 2019-05-03 18:30:07 +02:00
Mark van Alphen bcc1bdc168 Remove jumpsuit from uplink 2019-05-03 18:27:57 +02:00
variableundefinedandGitHub df4dd5660a Merge pull request #11422 from Markolie/reviver 
Make the traitor reviver implant EMP-proof
 2019-05-03 22:37:42 +08:00
variableundefinedandGitHub 01127dc5e9 Merge pull request #11429 from Mitchs98/pigcrate 
Adds Pig Crate to Cargo
 2019-05-03 22:19:50 +08:00
Shadeykins f14f8c1c08 Modifications to Quarantine/Corporate 
Swaps Quarantine law order. Adds some wording.

Fixed oversight in Corporate.
 2019-05-03 06:41:39 -06:00
Shadeykins 1c773a78c4 removes src. 
appeases the fox gods by removing src.
 2019-05-03 03:12:21 -06:00
Shadeykins da9740c524 Updates Aggressive 
Fixes up some oversights/preserves the original intent as per Denthamos' suggestions.
 2019-05-03 02:52:04 -06:00
Shadeykins 6b1732899e Typo. 
wellbeing -> well-being
 2019-05-03 01:53:30 -06:00
Shadeykins 094dc1f8c8 Adds in "Unauthorized" prefix. 
Basically so Engineering can do their job.
 2019-05-03 01:37:34 -06:00
Shadeykins e4aea8f3d1 AI Laws ahoy 
First commit.
 2019-05-03 00:59:21 -06:00
EvadableMoxie 5c2608330c Adds Nanotrasen Hospital ship, admin shuttle templates system. 2019-05-02 20:17:50 -04:00
Eman b27f084eb8 Admin created cultists can now properly summon their Gods 
Upon being made a cultist through admin means, the "summon spots" will now be generated, even if the game mode isn't cult. This allows admin created cultists to actually reach their goal of summoning their god, if it is what the admins told them to do.
 2019-05-02 15:35:40 +02:00
Unknown 0d81c2da7c Adds Pig Crate 2019-05-01 14:19:43 -05:00
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 AlphenandGitHub 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
variableundefinedandGitHub c8d890ef8a Merge pull request #11365 from Kyep/id_card_tracking 
Upgrades ID Computer
 2019-04-30 13:28:03 +08:00
variableundefinedandGitHub 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
variableundefinedandGitHub 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 McCloudandGitHub 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
variableundefinedandGitHub 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