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

5120 Commits

Author SHA1 Message Date
variableundefined
c8d890ef8a Merge pull request #11365 from Kyep/id_card_tracking 
Upgrades ID Computer
 2019-04-30 13:28:03 +08:00
variableundefined
0b5f0df20f Merge pull request #11400 from Arkatos1/torch 
Adds new torch sprites + tweaks
 2019-04-30 13:05:33 +08:00
variableundefined
32376093cb Merge pull request #11393 from Fox-McCloud/powernet-refactor 
TG Powernet Refactor
 2019-04-30 12:42:53 +08:00
Arkatos1
cd32b0211b Carp Expansion Pack 2019-04-29 23:47:25 +02:00
variableundefined
d55ecac3b0 Merge pull request #11347 from Arkatos1/StackCancel 
Working with stacks QoL update
 2019-04-29 23:00:15 +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
Fox McCloud
7b57d2e319 fixups 2019-04-29 04:41:31 -04:00
Arkatos1
010081bd96 Adds new torch sprites, torch now eminates orange light 2019-04-28 18:14:39 +02:00
Fox McCloud
d0a077f9d5 Powernet Refactor 2019-04-27 02:06:04 -04: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
Mark van Alphen
0d883a5b88 Darkness handling update 2019-04-23 22:59:00 +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
c4dc5ecd3d Merge branch 'ambientocclusion' of https://github.com/Markolie/Paradise into lighting 2019-04-22 18:52:55 +02:00
Fox McCloud
4761ded0d4 Merge pull request #11350 from AffectedArc07/ss-everything 
Gives the orphans a home
 2019-04-21 18:44:38 -04: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
AffectedArc07
ff78ff1a9c SScommunications 2019-04-21 20:12:14 +01:00
Arkatos1
d31b159813 Added bola throw sound, sound equality across all bolas 2019-04-21 20:25:14 +02:00
Arkatos1
5d508cd984 Stack QOL update 2019-04-21 13:57:30 +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
Arkatos1
bb985d44d4 Adds cancel button to teleportation scrolls 2019-04-19 15:59:03 +02:00
Mark van Alphen
09da967bd1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	_maps/map_files/RandomZLevels/moonoutpost19.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm
 2019-04-18 03:15:52 +02:00
variableundefined
31a2779bae Merge pull request #11259 from Markolie/flukeops 
Nuke Ops updates and buffs
 2019-04-18 07:16:31 +08:00
Mark van Alphen
6faf9c769f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
#	paradise.dme
 2019-04-17 22:46:43 +02:00
variableundefined
0bc6859d7e Merge pull request #11305 from Fox-McCloud/its-time 
It's Time
 2019-04-16 19:48:20 +08:00
variableundefined
546bd0edf5 Merge pull request #11288 from Fox-McCloud/toxins-remap 
Remaps Toxins
 2019-04-16 19:47:14 +08:00
Fox McCloud
7f00f8313a It's Time 2019-04-14 18:24:48 -04:00
Mark van Alphen
a9fa2f32e1 Remove infinite claw sharpening 2019-04-15 00:01:08 +02:00
Fox McCloud
93118f9d34 Remaps Toxins 2019-04-11 07:24:16 -04:00
Mark van Alphen
c597c9be51 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/turfs/simulated/floor/plating.dm
#	code/modules/clothing/suits/jobs.dm
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
 2019-04-11 07:27:51 +02:00
Mark van Alphen
69aa881c39 Flashbang fix 2019-04-11 05:32:54 +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
Crazy Lemon
1a57f440df Merge pull request #11257 from Fox-McCloud/nations-update 
The Nations Update Everyone Deserves!
 2019-04-09 20:47:34 -07:00
Fox McCloud
03d894ecfc Merge remote-tracking branch 'upstream/master' into fix-cqc 
# Conflicts:
#	code/game/objects/items.dm
 2019-04-07 19:54:14 -04:00
Mark van Alphen
f63b587f54 Nuke ops updates 2019-04-07 21:57:22 +02:00
variableundefined
7416eebf7f Merge pull request #11265 from Fox-McCloud/fix-pill-bottles 
Fixess Being Unable to Open Pill Bottles
 2019-04-07 22:12:01 +08:00
Fox McCloud
c0ca397d8a Fixess Being Unable to Open Pill Bottles 2019-04-07 09:25:45 -04:00
variableundefined
53d64d818d Merge pull request #11225 from TDSSS/box-revolver 
Trick revolver comes in a box.
 2019-04-07 21:14:51 +08:00
Fox McCloud
8cf68e7cae Fixes Russian Revolver 2019-04-07 07:37:02 -04:00
Fox McCloud
8446632fbc The Nations Update Everyone Deserves! 2019-04-06 20:30:04 -04:00
Mark van Alphen
391d91132c Fix code review issues (planetary_atmos and Initialize()) 2019-04-04 23:23:30 +02:00