cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 23:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,949 Commits 26 Branches 2 Tags
d02165e0f94de2c4a9399a8699cc355da4f8a329
Commit Graph

269 Commits

Author SHA1 Message Date
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
Arkatos1
84f96ff52f New Blob UI! Ported from /TG/. Also adds new reorganized Blob Help verb to help out new players in playing Blob. 2019-03-25 18:35:54 +01:00
Fox McCloud
4f99cc91d3 Merge remote-tracking branch 'upstream/master' into goonchem-reagent-temperature 2019-03-22 14:07:46 -04:00
Kyep
b2a6d883bd deletes blobmob checks on move/attack 2019-03-21 07:44:19 -07:00
Kyep
c3d93ef448 Makes blob monsters no longer spawn in xenobio 2019-03-21 06:16:26 -07:00
Kyep
d69b6ea310 Fixes blobbernaut exploit 2019-03-19 02:12:38 -07:00
Fox McCloud
277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
Fox McCloud
f01af6ae20 Implements Goon Smoke 2019-03-15 19:09:29 -04:00
datlo
cf1a95dabc fix config options 2019-02-04 00:21:13 +00:00
Aurorablade
86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
variableundefined
328a2d3dcb Merge pull request #10283 from Ty-Omaha/reflector-blob 
Adds/ports modified reflective blobs
 2018-11-24 08:28:37 +08:00
Ty-Omaha
f92db224c9 removes pulse check 2018-11-23 19:16:32 -05:00
Ty-Omaha
cb8bc0f34d reflector blobs 2018-11-23 11:19:55 -05:00