cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-20 02:27:36 +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
670 Commits
Author SHA1 Message Date
Markolie f4c4bfe288 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/__HELPERS/unsorted.dm
#	code/_globalvars/lists/objects.dm
#	code/controllers/verbs.dm
#	code/game/gamemodes/cult/ritual.dm
#	code/game/gamemodes/cult/runes.dm
#	code/game/objects/items/stacks/sheets/sheet_types.dm
#	code/modules/mob/spirit/mask/mask.dm
#	code/modules/mob/spirit/viewpoint.dm
#	icons/effects/96x96.dmi
#	icons/effects/effects.dmi
#	icons/mob/actions.dmi
#	icons/obj/weapons.dmi
#	icons/obj/wizard.dmi
#	icons/turf/floors.dmi
 2017-01-06 16:36:46 +01:00
Markolie 1f243ec4f0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2 
# Conflicts:
#	code/_globalvars/lists/objects.dm
 2016-12-31 17:54:06 +01:00
FalseIncarnate da421d841c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pogo 2016-12-29 21:13:00 -05:00
Markolie 8609157751 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
#	code/_globalvars/mapping.dm
#	code/game/objects/effects/landmarks.dm
 2016-12-30 00:17:56 +01:00
Markolie 01f2c85347 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/game/dna/genes/goon_powers.dm
#	code/game/dna/genes/vg_powers.dm
#	code/game/objects/effects/overlays.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/statue.dm
#	code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
#	icons/mob/back.dmi
#	icons/obj/storage.dmi
 2016-12-23 19:32:19 +01:00
Aurorablade 2dc1a48f35 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-12-01 22:38:35 -05:00
Markolie f63a9c279c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2 
# Conflicts:
#	code/defines/procs/announce.dm
#	code/modules/events/mass_hallucination.dm
 2016-10-31 14:46:58 +01:00
Markolie f27f72e61b ERT fixes 2016-10-26 03:05:51 +02:00
Markolie 61daab92f2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/mob/living/carbon/human/appearance.dm
 2016-10-25 18:31:39 +02:00
Markolie b3f505175e Announcement refactor 2016-10-24 22:03:18 +02:00
Markolie 2e711d1337 Lay groundwork for megafauna, and add Ashdragon. 
Includes a refactor for gun turrets (merged into portable turrets), hostile simple_animal behaviour, spells (sounds have been added) and poi_list items.
 2016-10-23 23:15:57 +02:00
FalseIncarnate 78d311d20a Nano-Mob Hunter GO! WIP commit 2016-09-03 02:25:53 -04:00
Aurorablade 767b4d3c3d will rework the map changes later... 2016-08-26 21:57:52 -04:00
Aurorablade 59262c49f5 insert middle finger here.. 2016-08-26 20:52:48 -04:00
KasparoVy cd9b12086b Merge remote-tracking branch 'upstream/master' into repathing-sprite-accessories 2016-08-26 02:28:47 -04:00
Fox-McCloud 8cd6e58c07 updates 2016-08-21 11:44:54 -04:00
KasparoVy 29a90bff9f Conflict resolution. 2016-08-18 03:28:03 -04:00
KasparoVy e0bfbd0af6 Keeping up to date. 2016-08-17 02:56:34 -04:00
Aurorablade baa8668dc6 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-08-12 23:53:32 -04:00
Fox-McCloud 41a74fb865 Malf AI Rework 2016-08-11 05:16:06 -04:00
Aurorablade 39924a55fd Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-08-11 02:01:41 -04:00
TheDZDandGitHub 91f18ac1d7 Merge pull request #5393 from Fox-McCloud/fast-processing 
Adds in Fast Processing
 2016-08-10 18:21:00 -04:00
KasparoVy 3610cfd4ea Markings refactor, body/marking/head accessory/hair sprite darkening, adds tail markings, more hair styles... 
Tajara ears are on their head now, fixes a crash bug with tail wagging
with body accessories that are split-rendered, adds secondary
hair/facial hair themes, fixes issues with human/skrell arm/lower body
sprites etc.
 2016-08-09 22:01:45 -04:00
Fox-McCloud 8cd140e48a Adds in Fast Processing 2016-08-09 06:55:00 -04:00
Aurorablade 5e90dd83ed Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-08-09 02:43:27 -04:00
Fox McCloudandGitHub 607642d4ef Revert "Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more..." 2016-08-08 23:26:51 -04:00
Fox McCloudandGitHub 86d0c0b2b9 Merge pull request #5147 from KasparoVy/tail-markings 
Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more...
 2016-08-08 21:58:45 -04:00
Crazylemon64 031dd2bb3d Iiiiit's merge conflict time! 
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
 2016-08-07 23:42:02 -07:00
Fox McCloudandGitHub a15721b22a Merge pull request #5209 from Krausus/OnceYouLeaveYouCannotComeBack 
Changes to Player Respawnability
 2016-08-03 19:12:04 -04:00
Crazylemon64 bf2bcbce67 Removes most hard-coded z level checks 2016-07-31 21:29:03 -07:00
Crazylemon64 ae43de3652 Integrates the z level manager with the space transition system 2016-07-29 19:11:36 -07:00
Aurorablade 9735ff78ac shuttles 2016-07-28 23:47:05 -04:00
KasparoVy 769a100580 Parallax revert. remote-tracking branch 'upstream/master' into tail-markings 2016-07-28 19:00:53 -04:00
Tigercat2000 288af9f92c Revert "Merge pull request #4739 from monster860/vg-parallax" 
This reverts commit 451c934379, reversing
changes made to 64f26d999f.

Conflicts:
	SQL/paradise_schema.sql
	SQL/paradise_schema_prefixed.sql
 2016-07-28 15:48:27 -07:00
KasparoVy 39d3d64207 Staying up to date. 2016-07-28 17:02:07 -04:00
monster860 b2cb87edc9 Merge branch 'master' into vg-parallax 2016-07-28 16:45:10 -04:00
Krausus dc9591e502 More respawnability changes 
- Respawning as a drone now ignores respawnability again
- Respawning as ERT now ignores respawnability again, but respawnable
ghosts get first dibs
- Becoming a non-respawnable ghost once means all future ghosting will
be be non-respawnable, unless you are sent back to the lobby
- Posibrains now disqualify non-respawnable ghosts, and are more fickle
about pinging
 2016-07-27 02:27:50 -04:00
KasparoVy 0232a7a427 Keeping up to date. 2016-07-21 11:57:15 -04:00
TheDZDandGitHub 6d095d50f5 Merge pull request #5102 from Fox-McCloud/reagent-refactors-continued 
More Reagent Refactoring and Cleanup
 2016-07-21 10:12:14 -04:00
Fox-McCloud 5fdad7355b more OOP 2016-07-21 06:33:39 -04:00
Fox-McCloud 00a470fd6d removes stupid sdisabilities 2016-07-21 02:24:54 -04:00
Fox-McCloud a58c85941b More Reagent Refactoring 2016-07-19 14:06:41 -04:00
KasparoVy 005066d891 Merge remote-tracking branch 'upstream/master' into tail-markings 2016-07-17 19:25:03 -04:00
SamCroswell 15a8b1d7d6 Merge Conflict Resolution 2016-07-16 18:47:18 -04:00
KasparoVy b274703a18 Adds Alt Heads 
known issues: no CMA support for changing alt heads
cant change alt head after you spawn in

To do: Finish unathi sharp snout lower marking
 2016-07-16 00:10:42 -04:00
Fox McCloudandGitHub 7c790a8b21 Merge pull request #4780 from Crazylemon64/space_ruins 
Crazypilot's Space Ruins Port
 2016-07-15 22:55:51 -04:00
SamCroswell 0466499f86 Personal Crafting - Initial Commit 2016-07-15 16:25:37 -04:00
KasparoVy 766245091b Back up to date. 2016-07-15 13:00:35 -04:00
monster860 94c1a4e08e Merge branch 'master' into vg-parallax 2016-07-08 14:51:30 -04:00
Crazylemon64 0e50e4f27a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-07-02 15:37:58 -07:00