cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-26 01:11:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,961 Commits 28 Branches 2 Tags
bdaf614b9d38efc306a6e36e0f10ef9dd2ea49ea
Commit Graph

7288 Commits

Author SHA1 Message Date
Fox-McCloud
bdaf614b9d Makes Hivelord Cores GC 2017-02-06 05:54:32 -05:00
Fox-McCloud
390f6768b3 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-02-05 05:26:46 -05:00
Fox-McCloud
99cbcbfbf5 pre-emptive cut-down of conflicts. 2017-02-05 03:18:49 -05:00
Mark van Alphen
fe62b212b4 Merge branch 'master' into lavaland_megafauna 2017-02-02 20:17:31 +01:00
Fox McCloud
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 McCloud
0874ea7295 Merge pull request #6152 from uraniummeltdown/windowflash 
Window Flashing
 2017-01-31 01:30:39 -05:00
Crazy Lemon
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
Fox-McCloud
7f2e71b0df GC fixes and explosive vine fix 2017-01-28 11:06:42 -05:00
Fox-McCloud
a77c40389e hydro hud working 2017-01-26 02:01:40 -05:00
Fox-McCloud
b1f789e104 fixes a ton of thing 2017-01-24 03:23:16 -05:00
Fox-McCloud
3e87bd3370 more adjustments and fixes 2017-01-23 05:56:17 -05:00
Fox-McCloud
5c828db250 fixes, comfrey, and aloe 2017-01-23 05:25:42 -05:00
Fox-McCloud
7007f6bbdf Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-23 01:01:09 -05:00
Fox-McCloud
dc0710135e more fixes 2017-01-23 00:53:44 -05: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
Fox-McCloud
706347fd84 even more work 2017-01-22 08:11:31 -05:00
Fox-McCloud
10c0e734c3 more work 2017-01-22 01:46:48 -05:00
Fox-McCloud
ea76990b7a Botany Rework 2017-01-21 18:28:03 -05: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 Lemon
37a7484976 Merge pull request #6149 from FlattestGuitar/log-upgrade 
Adds log stacking to admin logs
 2017-01-18 19:13:50 -08:00
Fox McCloud
03e3f1d624 Merge pull request #6169 from Aurorablade/KALIMAH 
Bugsie 3
 2017-01-18 18:52:19 -05:00
Crazy Lemon
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 McCloud
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 McCloud
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 McCloud
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 McCloud
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 McCloud
68dfbf6217 Merge pull request #6131 from Crazylemon64/robot_module_actions 
Robot module actions
 2017-01-11 08:50:50 -05:00
Crazy Lemon
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 McCloud
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