cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-16 00:26:56 +01:00
Code Issues Packages Projects Releases Wiki Activity
31,917 Commits 17 Branches 2 Tags
a8aef396255cc9831db7a35dd33358b7963da0ce
Commit Graph
7275 Commits
Author SHA1 Message Date
Mark van AlphenandGitHub fe62b212b4 Merge branch 'master' into lavaland_megafauna 2017-02-02 20:17:31 +01:00
Fox McCloudandGitHub 3d587dea5b Merge pull request #6177 from uraniummeltdown/new 
Cyborg Blueprints
 2017-02-02 00:50:33 -05:00
Markolie 2b767bb9c9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/mob/mob_helpers.dm
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/storage.dmi
 2017-01-31 17:44:38 +01:00
uraniummeltdown 7259e4ce07 blueprints for engiborgs 2017-01-31 19:22:29 +04:00
Fox McCloudandGitHub 0874ea7295 Merge pull request #6152 from uraniummeltdown/windowflash 
Window Flashing
 2017-01-31 01:30:39 -05:00
Crazy LemonandGitHub d76df747c5 Merge pull request #6272 from Markolie/fixxxxx 
Give brains Galactic Common language
 2017-01-30 22:02:34 -08:00
Tigercat2000 4e56bb9636 Add slot_collar, remove simple_animal add_inv/remove_inv 
This is being done to remove the simple_animal/Topic() override.
 2017-01-29 13:26:54 -08:00
Markolie d65cc380fa Give brains Galactic Common language 2017-01-29 00:06:00 +01:00
Markolie e9cc69ea3f If check spaces 2017-01-22 19:18:13 +01:00
Markolie d6276ae978 Tiger's comments 2017-01-22 19:15:26 +01:00
Markolie 2cedb7b20b Remove pooling, minor fixes 2017-01-21 02:48:19 +01:00
Markolie a50a3d59b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi
 2017-01-20 23:43:35 +01:00
Crazy LemonandGitHub 37a7484976 Merge pull request #6149 from FlattestGuitar/log-upgrade 
Adds log stacking to admin logs
 2017-01-18 19:13:50 -08:00
Fox McCloudandGitHub 03e3f1d624 Merge pull request #6169 from Aurorablade/KALIMAH 
Bugsie 3
 2017-01-18 18:52:19 -05:00
Crazy LemonandGitHub deba5d8b95 Merge pull request #6170 from Fox-McCloud/species-lever-options 
Adds Species Levers
 2017-01-18 15:35:17 -08:00
Mieszko Jędrzejczak 1b506aaf9f Switches over to the new system 2017-01-17 13:57:07 +01:00
Mieszko Jędrzejczak 9e7be0276a Adds log stacking to admin logs 2017-01-17 13:52:46 +01:00
Fox McCloudandGitHub 495cb56e74 Merge pull request #6191 from Krausus/CharacterSlotFixes 
Character Slot Randomization and Loading Fixes
 2017-01-16 13:31:19 -05:00
Krausus 6f96d0bae2 Character slot fixes 
Fixes "Randomized Character Slot" not working at all and the slot load
list running 20x as many SQL queries as it should
 2017-01-16 13:15:37 -05:00
Krausus f41069b8c1 Fixes force-feeding full people pills/patches 
Pills/patches now ignore fullness when being used on others, just like
they do when used on yourself.
 2017-01-16 04:31:50 -05:00
Krausus 3aa007a1c7 Pet slime tweaks 2017-01-14 17:38:08 -05:00
Aurorablade 5642ba19e7 Added failbacks for icon states 
updated firecult floor thanks to Jedr
 2017-01-14 13:02:05 -05:00
Fox-McCloud 56f0d79f15 Adds Species Levers 2017-01-14 03:51:43 -05:00
Fox McCloudandGitHub 2aa86d8777 Merge pull request #5704 from uraniummeltdown/lingfixesspecies 
Changeling Changes
 2017-01-13 15:50:17 -05:00
uraniummeltdown 770408636f attempt to add pref option 2017-01-12 21:20:16 +04:00
uraniummeltdown 11c0cb73f6 added it to defib, cloning, strange reagent 2017-01-12 19:44:18 +04:00
uraniummeltdown 02b5a096de windowflash proc, windowflash on notify_ghosts, pollcandidates, adminhelp and adminpm 2017-01-12 18:55:23 +04:00
Markolie f85e8fe551 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station.dm
#	icons/mob/screen_alert.dmi
 2017-01-11 23:11:29 +01:00
Fox McCloudandGitHub 42545b0583 Merge pull request #6133 from Crazylemon64/fix_custom_open_borgpanels 
Custom borg panels no longer overwrite themselves
 2017-01-11 08:53:31 -05:00
Fox McCloudandGitHub dce9edc6e3 Merge pull request #6129 from Crazylemon64/ghost_clearcut_respawnability 
Ghosts now have an indicator on whether they can respawn or not
 2017-01-11 08:52:37 -05:00
Fox McCloudandGitHub 68dfbf6217 Merge pull request #6131 from Crazylemon64/robot_module_actions 
Robot module actions
 2017-01-11 08:50:50 -05:00
Crazy LemonandGitHub f1c3a7cd13 Merge pull request #6085 from Fox-McCloud/food-rework 
Food rework
 2017-01-10 12:11:17 -08:00
FlattestGuitar 81b723577e Fixes a silly admin logs runtime 2017-01-10 19:45:46 +01:00
uraniummeltdown 7667112d6f changed lingprotect flag to notranssting, no injecting vox or plasmaman dna, plasmamen can be ling and affected by powers 2017-01-10 22:13:19 +04:00
Fox McCloudandGitHub cfc5c0a10b Merge pull request #6114 from uraniummeltdown/mimename 
Mimes can rename themselves
 2017-01-10 04:02:21 -05:00
Crazylemon64 36b967c93b Fully rips out cyborg sight modules 2017-01-10 00:32:11 -08:00
Crazylemon64 53977e2729 Ayyyyyy 2017-01-10 00:18:46 -08:00
Crazylemon64 3408f63f6d Borgs now have vision actions instead of items to toggle vision modes 2017-01-10 00:18:46 -08:00
Crazylemon64 01450122b2 Adds preliminary robot module sight actions 
No icons yet, that's another commit
 2017-01-10 00:18:46 -08:00
Crazylemon64 ca9142bce0 Custom borg panels no longer overwrite themselves 2017-01-10 00:16:24 -08:00
Fox McCloudandGitHub 5770602a82 Merge pull request #6117 from TullyBurnalot/BorgScannu 
pAI HUD Tweak
 2017-01-10 03:16:04 -05:00
Fox McCloudandGitHub 7c72bfb548 Merge pull request #6130 from Crazylemon64/always_the_most_obvious 
Borg sight modules work again
 2017-01-10 03:12:57 -05:00
Crazylemon64 238e7c4f42 Borg sight modules work again 2017-01-09 19:45:31 -08:00
Crazylemon64 bf24bc9b10 pAIs are no longer evicted from their bodies at death 2017-01-09 19:27:04 -08:00
Crazylemon64 baa721b68f Ghosts now have an indicator on whether they can respawn or not 2017-01-09 19:24:08 -08:00
Crazylemon64 c5b54e8bd1 pAIs (and other wrapped player mobs) can now hear whispers on adjacent 
tiles
 2017-01-09 19:09:44 -08:00
Crazylemon64 d3e8a7e646 Makes things a little more clear-cut on being eligible for pAI 2017-01-09 18:20:30 -08:00
Crazylemon64 5234d3aa36 pAIs in PDAs can now whisper 2017-01-09 18:08:35 -08:00
Crazylemon64 148c3905a5 Fixes both pai resting jankiness, pai body re-entering 
and not being able to change the radio frequency
 2017-01-09 15:14:26 -08:00
Markolie 0adc370d55 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/game/machinery/turrets.dm
 2017-01-09 22:00:31 +01:00