cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 03:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,145 Commits 26 Branches 2 Tags
5452d4e8df05abd2e19b8fc8474cf0a1bf345729
Commit Graph

9205 Commits

Author SHA1 Message Date
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
KasparoVy
489b10d47f Runtime resolved 2019-04-16 19:43:56 -04:00
variableundefined
0bc6859d7e Merge pull request #11305 from Fox-McCloud/its-time 
It's Time
 2019-04-16 19:48:20 +08:00
variableundefined
ff9de147e1 Merge pull request #11287 from Fox-McCloud/fix-goats 
Fixes and Updates Goats
 2019-04-16 19:48:04 +08:00
variableundefined
eb83a2dee7 Merge pull request #11285 from Fox-McCloud/elecrocution-refactor 
Refactors Electrocution
 2019-04-16 19:47:42 +08:00
variableundefined
e8b506be9b Merge pull request #11304 from Markolie/claws 
Remove infinite claw sharpening with whetstones
 2019-04-16 19:42:08 +08:00
Fox McCloud
3ff16da2e2 Merge pull request #11301 from KasparoVy/vox-undergarments 
Adds Striped Normal-height Socks & All the Undergarments for Vox
 2019-04-15 11:44:34 -04: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
Mark van Alphen
e09956cc17 Dwarf legion fix 2019-04-14 22:31:25 +02:00
Mark van Alphen
2f38e94e77 Fix hivelord neck equipping 2019-04-14 22:12:34 +02:00
KasparoVy
923614a475 Codes in the Undergarments, Final Sprite Tweaks & Armalis Fix 
Removes the old Vox undergarments
Adds species_fitting of undergarments (making all the Vox versions usable) to update_icons and character setup preview
Disables undergarments for Armalis
Fixes & adjusts some Vox undergarment sprites based on testing results.
Removes flesh from shredded Vox uniform sprites.
 2019-04-13 22:00:13 -04:00
Fox McCloud
58a7107eae shocking animals 2019-04-12 16:03:18 -04:00
Mark van Alphen
246d2099ae Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/__DEFINES/misc.dm
 2019-04-12 19:44:31 +02:00
variableundefined
19a26909dc Merge pull request #11279 from Arkatos1/Orbit 
Ghosts now orbit around their followed targets
 2019-04-11 20:41:37 +08:00
Fox McCloud
cf880bd40b Fixes and Updates Goats 2019-04-11 04:24:36 -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
Crazy Lemon
6c4eb66da8 Merge pull request #11282 from Fox-McCloud/atmos-defines 
Atmos Define Cleanup + Plasma Tweaks
 2019-04-10 22:18:52 -07:00
Fox McCloud
90c9f3f479 Refacors Electrocution 2019-04-10 18:09:14 -04: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
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
variableundefined
1a5b5dabe4 Merge pull request #11230 from Fox-McCloud/tweaks-crit 
Newcrit Death Tweak
 2019-04-10 10:47:02 +08:00
variableundefined
9ae231ee99 Merge pull request #10327 from Fox-McCloud/fix-cqc 
Fixes and Updates CQC
 2019-04-10 10:36:44 +08:00
variableundefined
17030d02fe Merge pull request #11214 from Arkatos1/Sling_Chat 
Shadowlings now have a slightly bigger colored text when speaking in the Shadowling Hivemind
 2019-04-10 10:13:16 +08:00
Fox McCloud
06713d604f Atmos Define Cleanup + Plasma Tweaks 2019-04-09 11:22:01 -04:00
Arkatos1
da73c134db Ghosts now orbit their followed targets 2019-04-09 02:17:40 +02: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
Crazy Lemon
b59a5d37b6 Merge pull request #11266 from Markolie/hotkeymode 
Fix Hotkey Toggle button
 2019-04-07 14:16:06 -07:00
Mark van Alphen
ddc3a02ab3 Fix thermal for saboteur, reinforcement bugfix, re-add C4 pack 2019-04-07 23:04:43 +02:00
Mark van Alphen
f63b587f54 Nuke ops updates 2019-04-07 21:57:22 +02:00
Mark van Alphen
91e6cb9347 Fix hotkey mode button 2019-04-07 18:42:08 +02:00
variableundefined
ff8dc59367 Merge pull request #11229 from Fox-McCloud/reagent-tweaks 
[Goonchem] Reagent tweaks
 2019-04-07 21:22:18 +08:00
variableundefined
fc616d8a19 Merge pull request #11242 from Markolie/hotkeymode 
Hotkey mode handling is now instantaneous
 2019-04-07 21:21:21 +08:00
variableundefined
525b28014c Merge pull request #11026 from farie82/popup-limiting 
Gives the option to limit the text popups to 1
 2019-04-07 20:41:24 +08:00
variableundefined
86ea35c25b Merge pull request #11161 from Kyep/terrorspider_patch_post_newcrit 
Terror Spider tweaks
 2019-04-07 20:30:48 +08:00
variableundefined
4f8494e89e Merge pull request #10999 from Kyep/ghost_verb 
Tweaks Ghost Verb
 2019-04-07 15:27:56 +08:00
Arkatos1
16a1a6d19a Shadowling text bolded in the Shadowling Hivemind 2019-04-07 04:06:47 +02:00
Fox McCloud
8446632fbc The Nations Update Everyone Deserves! 2019-04-06 20:30:04 -04:00
Mark van Alphen
2ba56c33de Code review fix 2019-04-06 06:17:29 +02:00
Mark van Alphen
aa58a88296 Switch to client-side hotkey toggling 2019-04-05 22:45:05 +02:00
joep van der velden
75d9852d33 Perps no longer need glasses to be set 2019-04-05 09:35:43 +02:00
Mark van Alphen
391d91132c Fix code review issues (planetary_atmos and Initialize()) 2019-04-04 23:23:30 +02:00
Arkatos1
773865961b Colored title for Shadowlings in the Shadowling Hivemind 2019-04-04 22:08:49 +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
33d6017e28 Merge branch 'turfs' of https://github.com/Markolie/Paradise into turfs 2019-04-04 22:01:50 +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
Mark van Alphen
d077138c3d Merge pull request #4 from CornMyCob/turfs 
blood drunk miner
 2019-04-04 21:41:45 +02:00
CornMyCob
e02087d474 blood drunk miner 2019-04-04 20:34:26 +01:00