cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-11 22:30:30 +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
tayyyyyyy 7a6321ca5f Autocomplete input for ghost buttons 2019-05-22 17:18:32 -07:00
Couls fe68c74466 Merge branch 'master' into diagonal-movement 2019-05-22 14:24:54 -04:00
Arkatos1 fb8313308e added action button ability to lock or unlock them in place 2019-05-21 22:44:54 +02:00
Arkatos1 ca708563e5 more fixes 2019-05-20 21:02:53 +02:00
Arkatos1 72abc2665e fixes for cling aug vision and general action buttons 2019-05-20 15:42:20 +02:00
Citinited d36cb324a0 Spells now charge using the fast processing subsystem 2019-05-19 18:52:01 +01:00
Citinited da51a3315c Fix for infinite boo 2019-05-18 13:02:06 +01:00
Mark van Alphen 2c5e216e82 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	paradise.dme
 2019-05-17 17:37:18 +02:00
variableundefined 19c8a8265e Merge pull request #11486 from Tayyyyyyy/better_ert_spawn 
Non-blocking ERT selection/spawn
 2019-05-17 23:07:30 +08:00
variableundefined 719ffda09e Merge pull request #11438 from Emanthealmighty/AdminCultist-change 
Admin created cultists can now properly summon their Gods.
 2019-05-17 19:15:39 +08:00
Couls 8083b51a96 Initial commit 2019-05-16 22:36:30 -04:00
Fox McCloud 68effd9d83 The End 2019-05-13 17:22:57 -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 f35c87dc19 Merge branch 'master' into ss-ticker 2019-05-13 18:14:00 +01:00
Fox McCloud c2df74312e Prevents Future SSTicker from Runtiming 2019-05-13 03:18:34 -04:00
Fox McCloud a8af6f53c3 Merge pull request #11501 from Markolie/lighting 
Fix X-Ray on death for simple mobs
 2019-05-09 16:53:49 -04:00
tayyyyyyy 665659bd88 Asynchronously spawn ERT 2019-05-09 11:52:28 -07:00
Mark van Alphen afc22b03ed Fix X-Ray on death for simple_mobs, fix view variables damage for non-humans 2019-05-09 19:52:29 +02:00
AffectedArc07 510c210930 Merge 2019-05-09 17:06:35 +01:00
Fox McCloud 23c884e14c Merge pull request #11494 from Markolie/lighting 
Lighting fixes
 2019-05-09 00:09:16 -04:00
Mark van Alphen 458e59a191 Final weather fix 2019-05-09 05:53:53 +02:00
Mark van Alphen b66ac0559e Add initial plane to weather 2019-05-09 05:23:14 +02:00
Mark van Alphen 502b8aebc5 Weather lighting fix 2019-05-09 05:09:54 +02:00
Mark van Alphen e6b7fd9149 Move night vision spell and give it to constructs 2019-05-09 03:11:06 +02:00
Fox McCloud 3d90ccbfb7 nevermind, just generic fixes 2019-05-08 20:15:24 -04:00
Fox McCloud 61b337578b Potentially Solves Disappearing Human Mob Issue? 2019-05-08 17:25:35 -04:00
Mark van Alphen 2618def9a1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	_maps/map_files/Delta/delta.dmm
#	_maps/map_files/MetaStation/MetaStation.v41A.II.dmm
#	_maps/map_files/MetaStation/z4.dmm
#	_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
#	_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
#	_maps/map_files/RandomZLevels/spacebattle.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm
#	_maps/map_files/cyberiad/z4.dmm
#	_maps/map_files/cyberiad/z6.dmm
#	_maps/map_files/generic/z5.dmm
#	code/__DEFINES/misc.dm
#	code/__HELPERS/unsorted.dm
#	code/game/objects/structures/lattice.dm
#	code/game/turfs/space/space.dm
#	code/modules/mob/mob.dm
#	code/modules/ruins/ruin_areas.dm
#	paradise.dme
 2019-05-08 21:40:35 +02:00
Mark van Alphen 7fb7cdc57f Chair plane fix (and maybe fixes the disappearing humans, too) 2019-05-06 03:52:01 +02:00
Shadeykins eeb626887a Wording in Aggressive 
Basically the "it" here referred to "harm" and the statement was amibiguous. "It" in this case was however modifying "harm" and not "not harm," which meant that the AI was encouraged to imperil its existence by harming people.

This clarifies the original intent.
 2019-05-04 16:04:52 -06:00
Couls fb619648a9 Resolve conflicts 2019-05-03 22:28:04 -04: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
Mark van Alphen f3fb39b339 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	code/__DEFINES/misc.dm
 2019-05-04 03:07:36 +02:00
variableundefined 5357e0e36f Merge pull request #11428 from Markolie/bundles 
Chameleon overhaul
 2019-05-04 08:23:40 +08:00
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
variableundefined df4dd5660a Merge pull request #11422 from Markolie/reviver 
Make the traitor reviver implant EMP-proof
 2019-05-03 22:37:42 +08:00
variableundefined 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