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

9380 Commits

Author SHA1 Message Date
Arkatos1
1c74f848e1 Merge https://github.com/ParadiseSS13/Paradise into LingIcons 2019-05-10 14:41:08 +02:00
datlo
edee2cfcea Replace by job check 2019-05-10 13:36:35 +01:00
Fox McCloud
a8af6f53c3 Merge pull request #11501 from Markolie/lighting 
Fix X-Ray on death for simple mobs
 2019-05-09 16:53:49 -04:00
Mark van Alphen
afc22b03ed Fix X-Ray on death for simple_mobs, fix view variables damage for non-humans 2019-05-09 19:52:29 +02:00
AffectedArc07
510c210930 Merge 2019-05-09 17:06:35 +01:00
Fox McCloud
eb95a42672 Fixes Ghosts Drifting 2019-05-09 02:51:44 -04:00
variableundefined
3820abb1ff Merge pull request #11493 from Fox-McCloud/mob-icon-fix-maybe 
Generic Layering and forceMove fixes
 2019-05-09 12:06:48 +08:00
Fox McCloud
3d90ccbfb7 nevermind, just generic fixes 2019-05-08 20:15:24 -04:00
AffectedArc07
531201fab4 Merge branch 'master' into hooks-part4 2019-05-08 22:21:12 +01:00
Fox McCloud
6563a01bec Merge pull request #11489 from Markolie/lighting 
Lighting fixes
 2019-05-08 16:17:12 -04: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
9b60ea5d95 Make sure the screen is reset, just in case 2019-05-08 17:22:24 +02:00
Mark van Alphen
71e3d5187f Lighting fixes: makes sure new_players have a HUD and that sight flags are reset properly 2019-05-08 17:18:27 +02:00
Fox McCloud
79815eb042 Merge pull request #11357 from Markolie/lighting 
Lighting system update
 2019-05-08 00:27:16 -04:00
AffectedArc07
29f95173fc This wont cause a problem *server dies* 2019-05-07 22:08:38 +01:00
AffectedArc07
014d803eba Merge branch 'master' into hooks-part4 2019-05-07 21:22:59 +01:00
variableundefined
6c174cdee5 Merge pull request #11315 from farie82/Species-transformation-fix 
Fixes species transformations not retaining items correctly
 2019-05-07 16:56:21 +08:00
variableundefined
af237fe05b Merge pull request #11427 from Arkatos1/color_examine 
Species name now shows in a species theme color on examine
 2019-05-06 18:43:26 +08:00
AffectedArc07
19d8efef68 Morgue Updating [Hooks P4] 2019-05-06 10:08:28 +01:00
Mark van Alphen
79d761063a Rename ghost darkness images 2019-05-06 04:06:54 +02:00
Arkatos1
d8dcd762a8 Gold color 2019-05-06 00:09:27 +02:00
Fox McCloud
f6801461af Merge pull request #11440 from farie82/xeno-devour-fix 
Force move for regurgitate and devour now
 2019-05-05 16:43:50 -04:00
Mark van Alphen
90f71f164a Remove unused species_fit and move chameleon file 2019-05-05 20:37:53 +02:00
joep van der velden
7a55bca054 can't eat while buckled 2019-05-05 13:23:31 +02:00
AffectedArc07
96edeacec5 Removes unused hooks 2019-05-05 10:28:56 +01:00
Arkatos1
6020d1d397 Merge https://github.com/ParadiseSS13/Paradise into LingIcons 2019-05-04 15:27:48 +02:00
Fox McCloud
9b00e11628 Fixes Warning Spam for Mob Transitions and Roundstart Spawning 2019-05-03 23:08:36 -04: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
f3fb39b339 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	code/__DEFINES/misc.dm
 2019-05-04 03:07:36 +02:00
Mark van Alphen
bbeb07abd2 More lighting fixes 2019-05-04 03:06:10 +02:00
variableundefined
3ba90f87df Merge pull request #11384 from Kyep/no_free_jobs 
Adds error message when trying to join with no free job slots
 2019-05-04 08:34:09 +08:00
variableundefined
5357e0e36f Merge pull request #11428 from Markolie/bundles 
Chameleon overhaul
 2019-05-04 08:23:40 +08: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
Fox McCloud
9d4928b37a Merge pull request #11450 from variableundefined/AIOptimization2 
AI Optimization, SNPC Removal 2.0
 2019-05-03 13:30:41 -04:00
Mark van Alphen
35b1cee88b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/obj/toy.dmi
 2019-05-03 18:31:45 +02:00
Mark van Alphen
d646ab0934 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	code/game/area/Space Station 13 areas.dm
 2019-05-03 18:30:07 +02:00
variableundefined
d45d8b5731 Merge pull request #11403 from Kyep/oxytank 
Makes active internals visible in pockets
 2019-05-03 22:41:02 +08:00
variableundefined
c1129e44b9 Merge pull request #11415 from Twinmold93/server_time 
Adds Server Time to MC Tab for Admins
 2019-05-03 22:40:40 +08:00
variableundefined
b1bbac3bd7 Merge pull request #11416 from KasparoVy/swippity-swappity 
Adds Eyewear Adjustment: Wearing Over/Under Masks
 2019-05-03 22:40:21 +08:00
variableundefined
6e79364b65 Here we go again 2019-05-03 21:47:07 +08:00
joep van der velden
86cdeb3fa1 Force move for regurgitate and devour now 2019-05-02 20:12:24 +02:00
Twinmold93
fe0c04534f Moved to MC Tab 
Moves the time stamp to the MC Tab per Fox's request.
 2019-05-02 12:59:05 -05:00
Arkatos1
b931c6669b Plasmamen addition 2019-05-02 18:50:28 +02:00
Arkatos1
8b50022858 Old code cleanup 2019-05-02 18:31:31 +02:00
Arkatos1
fedb9c1770 Added icons, fixes, special cases resolved 2019-05-02 18:28:39 +02:00
Arkatos1
2e4de13f0f Initial commit 2019-05-02 01:30:17 +02:00
Mark van Alphen
e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
Arkatos1
9f87fbdd35 Examine species colors 2019-05-01 18:54:14 +02:00
variableundefined
664c66b8da Merge pull request #11409 from farie82/borg-fixes 
Various borg fixes
 2019-05-01 08:51:55 +08:00
variableundefined
9d32120975 Merge pull request #11413 from Arkatos1/carp 
Carp Expansion Pack
 2019-05-01 08:50:52 +08:00