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

3370 Commits

Author SHA1 Message Date
Mark van Alphen
ba3f65049d Port over remaining Lavaland ruins 2019-06-07 01:19:55 +02:00
Mark van Alphen
b65fbb907e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/obj/vending.dmi
#	paradise.dme
 2019-05-30 19:35:52 +02:00
variableundefined
3acf995a76 Merge pull request #11466 from Markolie/bundles 
Species chameleon fix
 2019-05-28 10:53:17 +08:00
variableundefined
3dae8eded3 Merge pull request #11430 from Markolie/actual_bundles 
[DNM] Uplink bundle rebalance
 2019-05-27 23:05:46 +08:00
variableundefined
24b0e5248f Merge pull request #11465 from farie82/handcuff-nodrop-fix 
Can't use cuffs with nodrops now
 2019-05-25 21:01:18 +08:00
Mark van Alphen
ec70c2512d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into bundles 
# Conflicts:
#	code/modules/clothing/masks/breath.dm
#	code/modules/clothing/masks/gasmask.dm
 2019-05-23 18:56:25 +02:00
Mark van Alphen
2c5e216e82 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	paradise.dme
 2019-05-17 17:37:18 +02:00
variableundefined
3338d8b907 Merge pull request #11476 from Arkatos1/inhand 
New inhand sprites
 2019-05-17 19:17:32 +08: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
Mark van Alphen
acbf627f8c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into bundles 
# Conflicts:
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/customitems/item_defines.dm
 2019-05-13 22:08:49 +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
Arkatos1
b2e7149f1d Adds new inhand sprites 2019-05-06 16:08:38 +02: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
a015ab755f Cuffs can't be used when you have antidrop on 2019-05-05 13:14:00 +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
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
5357e0e36f Merge pull request #11428 from Markolie/bundles 
Chameleon overhaul
 2019-05-04 08:23:40 +08: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
8928210da1 Merge pull request #11425 from Arkatos1/delay 
Examine tooltips tweaks
 2019-05-03 22:48:15 +08:00
Mark van Alphen
eac4f841ce Switch to penetrator/sopo rounds only 2019-05-02 01:39:11 +02:00
Mark van Alphen
b3d7681a4a Discord feedback on bundles 2019-05-01 22:24:51 +02:00
Mark van Alphen
5216106192 Uplink kit rebalance 2019-05-01 21:35:56 +02:00
Mark van Alphen
f7a52dcec0 COMIC injector fix 2019-05-01 21:07:43 +02:00
Mark van Alphen
86b90bab2c And fix the uplink kits 2019-05-01 21:01:16 +02:00
Mark van Alphen
e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
Arkatos1
24b0eb0c0c toolbelt update 2019-05-01 16:57:54 +02:00
Arkatos1
c6a91eafdd Tweaks 2019-05-01 16:04:07 +02:00
Arkatos1
791bebf51c Tweaks to Examine tooltips 2019-05-01 15:50:30 +02: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
variableundefined
c8d890ef8a Merge pull request #11365 from Kyep/id_card_tracking 
Upgrades ID Computer
 2019-04-30 13:28:03 +08:00
variableundefined
98b8efc080 Merge pull request #11349 from Arkatos1/BolaSound 
Adds bola throw sound, sets hitsound for all types of bolas
 2019-04-29 22:53:46 +08:00
variableundefined
3747721232 Merge pull request #11335 from Arkatos1/DiceRoll 
Dice will now roll when thrown
 2019-04-29 22:27:51 +08: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
Arkatos1
8d79486d3a Code review fixes 2019-04-24 16:29:22 +02:00
Fox McCloud
89883a7b28 fixes 2019-04-24 00:49:23 -04:00
Kyep
3ef424eb5c upgrades ID computer 2019-04-23 21:02:27 -07: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
variableundefined
b738f9a92f Merge pull request #11283 from Fox-McCloud/emote-refactor 
Emote Refactor
 2019-04-23 19:44:26 +08:00
Mark van Alphen
7fef96e38d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	paradise.dme
 2019-04-21 23:27:23 +02:00
Arkatos1
d31b159813 Added bola throw sound, sound equality across all bolas 2019-04-21 20:25:14 +02:00
Mark van Alphen
211468b24f Add fake ambient occlusion 2019-04-21 01:45:30 +02:00
Mark van Alphen
c878f8e36e Lavaland code review fixes - also integrates flyswatter and cat toy 2019-04-20 00:24:58 +02:00
Arkatos1
321748a7e7 Dice will now roll when thrown 2019-04-19 22:48:15 +02:00