cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-22 16:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,489 Commits 26 Branches 2 Tags
96840368d40f49d172cb15c39cc9a9cb8c835615
Commit Graph

331 Commits

Author SHA1 Message Date
Mark van Alphen
14e8022daf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix 
# Conflicts:
#	code/game/objects/effects/step_triggers.dm
 2019-08-09 23:38:49 +02:00
Eman
51c1780f77 Increased the resources needed to create blobbernauts 2019-08-01 13:39:14 +02:00
Eman
cf46e2b7ce Small changes 
Blobbernauts regenerate health slower. -0.25 from -0.5 per tick.
The prompt to play as a blobbernaut now only lasts 15 seconds instead of 30.
 2019-07-30 21:32:57 +02:00
Eman
19f90acdd0 Blobbernaut major changes 
Blobbernauts can now be controlled by players through a prompt whicha appears when they are spawned by blobs.
Blobbernauts have been nerfed, they now have less health, deal less damage and cannot break walls anymore.
Blobbernauts now regenerate health overtime when standing on blob structures.
Blobbernauts and blobs can now communicate with each other.
Blob's "Produce Blobbernaut" ability has been made more expensive to use, now costing 40 resources instead of 20.
 2019-07-30 18:24:56 +02:00
Mark van Alphen
fd579015b1 Portal fixes - adds oldloc to Crossed() 2019-07-15 20:16:17 +02:00
tayyyyyyy
57c700a814 Sanitize all inputs 2019-07-14 09:35:12 -07:00
Arkatos1
370d087b2b Jump to node blob ability now shows location of each node 2019-07-01 13:45:53 +02:00
Ty-Omaha
bc857784e8 Spelling 2019-06-24 10:31:32 -04:00
Ty-Omaha
8d7fcc272c Exploit fix 2 2019-06-24 02:26:13 -04:00
Ty-Omaha
d62de2a6fb Reflective Fix 2019-06-24 02:19:20 -04:00
datlo
32812736ee Integrate free golems as a lavaland ruin 2019-05-31 09:30:03 +01:00
Mark van Alphen
f45d16f2c3 Observer/hud improvements and fixes 2019-05-27 19:59:54 +02:00
Mark van Alphen
ef479cb982 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/feet.dmi
#	paradise.dme
 2019-05-23 19:04:09 +02:00
variableundefined
0302a48780 Merge pull request #11521 from Arkatos1/splitfix 
Blob split consciousness fix
 2019-05-23 22:09:45 +08:00
Arkatos1
a78cf680de grammar fixes 2019-05-17 14:02:38 +02: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
Arkatos1
8a1f3ced79 Fix for admin spawned blob cores 2019-05-12 13:55:16 +02:00
Arkatos1
115f191084 blob split fix 2019-05-12 13:19:52 +02:00
AffectedArc07
510c210930 Merge 2019-05-09 17:06:35 +01: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
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
4c99f3913b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	paradise.dme
 2019-05-03 20:31:41 +02:00
variableundefined
6e79364b65 Here we go again 2019-05-03 21:47:07 +08: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 Alphen
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
Arkatos1
e375144c49 Code cleanup 2019-04-29 18:22:20 +02:00
Arkatos1
0d04237388 Rolled back some changes 2019-04-29 18:16:15 +02:00
Arkatos1
e9b213f519 Initial commit 2019-04-29 16:44:45 +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
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
Mark van Alphen
0d883a5b88 Darkness handling update 2019-04-23 22:59:00 +02:00
Mark van Alphen
f94796c125 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/items.dm
#	icons/turf/floors/plating.dmi
#	paradise.dme
 2019-04-10 21:54:54 +02:00
Fox McCloud
c536c55b28 Emote Refactor 2019-04-10 15:42:12 -04:00
Arkatos1
de61851512 Fixes refund with strong blob spawned near Core 2019-04-08 19:42:56 +02:00
Mark van Alphen
a21ec0f30b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2019-04-04 22:04:55 +02:00
Mark van Alphen
877cfc4d7d Refactor catwalks to not be floors, update chasms and fix Lavaboat 2019-04-04 22:01:25 +02:00
Crazy Lemon
1933509631 Merge pull request #11160 from Fox-McCloud/new-crit-balance-tweaks 
New Crit Balance Tweaks--Blobs and Stands
 2019-04-03 11:34:32 -07:00
Fox McCloud
a58217c37e Merge pull request #11164 from Kyep/blobbernaut_2 
Blobbernaut 2
 2019-04-02 18:12:06 -04:00
Arkatos1
8669ea1716 Removed Dark Matter for real, improved descriptions and added Blob Overminds to Check Antagonists verb 2019-03-30 15:00:12 +01:00
Arkatos1
e2b0324970 Code improvement 2019-03-30 02:28:50 +01:00
Arkatos1
a22d31f350 Complete Blob UI, Blob mobs now use complementary colors, special blob tiles refund, node requirement verb, minor refactors, remove shortcut improvement, dark matter removed from blob reagents, custom icons 2019-03-30 02:16:30 +01:00
Kyep
2d8c62ff98 Blobbernaut 2 2019-03-29 08:18:10 -07:00
variableundefined
e9aef15929 Merge pull request #11080 from Kyep/blobbernaut_fix 
Fixes blobbernaut exploit
 2019-03-29 20:29:29 +08:00
Fox McCloud
7fabbe4a1c New Crit Balance Tweaks--Blobs and Stands 2019-03-28 22:22:51 -04:00
Arkatos1
5ad867eb78 Adds left click as a shortcut to expand blob, adds remove blob as a new shortcut, reshuffles shortcut to achieve parity with other codebases 2019-03-26 21:14:45 +01:00
Arkatos1
ea2cc23111 Added reagent description when blob does chemical reroll, adds complementary color to all reagents, marker now uses complementary colors of reagents, minor formatting 2019-03-26 20:51:06 +01:00
Arkatos1
c0b5359cbd Added descriptions to all blob reagents, and added them to the Blob Help. Reorganized Blob Help a little. 2019-03-26 18:38:09 +01:00