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

19783 Commits

Author SHA1 Message Date
Mark van Alphen
d9be6c5a1a Code review changes 2019-04-19 19:12:21 +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
38d17a42a5 Merge pull request #11313 from farie82/tape-gag-fix 
Fixes the tape gag still being there. Invinsible
 2019-04-18 07:49:25 +08:00
variableundefined
391104fdb0 Merge pull request #11243 from CornMyCob/plasmacutter-buff 
Makes the plasma cutter less shit
 2019-04-18 07:35:27 +08: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
Mark van Alphen
4c26388a8b Remove white shuttle landing spot 2019-04-17 22:40:08 +02:00
joep van der velden
9b0c5847b5 no qdel needed 2019-04-17 11:29:52 +02:00
joep van der velden
79de060cb0 Fixes the tape gag still being there. Invinsible 2019-04-17 11:22:15 +02:00
KasparoVy
489b10d47f Runtime resolved 2019-04-16 19:43:56 -04:00
Mark van Alphen
73780fcb21 Spacing fix 2019-04-16 16:01:54 +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
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
b6c1026d74 Merge pull request #11297 from Fox-McCloud/update-gas-overlay 
Updates and Fixes Gas Overlays and Icy Floor Change
 2019-04-16 19:45:51 +08:00
variableundefined
46d32bf052 Merge pull request #11298 from Kyep/ban_fix 
Fixes bans not saving properly
 2019-04-16 19:45:32 +08:00
variableundefined
dc825a7bfa Merge pull request #11231 from Arkatos1/Tips 
Adds Tip of the round + Show Custom Tip admin verb + Give Random Tip OOC verb
 2019-04-16 19:43:55 +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
Mark van Alphen
e7e6752c54 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/controllers/master_controller.dm
#	paradise.dme
 2019-04-14 19:17:06 +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
Kyep
2726324dfa removes non-IP ban option for legacy bans, because DB bans won't honor it regardless 2019-04-13 12:51:34 -07:00
Kyep
35a58864e4 add ip/cid to db bans 2019-04-13 12:44:45 -07:00
Fox McCloud
964bf03697 icy floors 2019-04-13 04:44:25 -04:00
joep van der velden
36f5c8ea14 let cmd_admin_pm handle the null client 2019-04-13 10:42:08 +02:00
joep van der velden
9598dcac5e fixed PM's 2019-04-13 00:57:59 +02:00
Fox McCloud
58a7107eae shocking animals 2019-04-12 16:03:18 -04:00
Mark van Alphen
6a8035734e Maximize fire protection on Ash Drake armour 2019-04-12 19:45:49 +02: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
Mark van Alphen
36b74eeaea Add proper config for ruins, helm fix, selfloop Lavaland 2019-04-12 19:41:31 +02:00
Mark van Alphen
6fcd95fa50 Compile fix 2019-04-11 22:16:27 +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
112129779c Merge pull request #11280 from Ionward/mantles 
Adds suit-slot cosmetic mantles!
 2019-04-11 00:43:29 -04: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
Ionward
54536350c7 adjusted cold protection inheritence stuff 2019-04-10 12:09:08 -07:00
Ionward
0266c2fee2 fixed the display names in the loadout to fit alphabetical order better, and adjusted allowed list spacing 2019-04-09 21:12:25 -07:00
Ionward
4d754dde41 adjusted armor values and added options to the suit loadout menu 2019-04-09 20:49:14 -07: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
c6b8daa9b1 Merge pull request #11227 from Fox-McCloud/sr-update 
Minor Strange Reagent Tweaks
 2019-04-10 10:47:40 +08:00
variableundefined
1a5b5dabe4 Merge pull request #11230 from Fox-McCloud/tweaks-crit 
Newcrit Death Tweak
 2019-04-10 10:47:02 +08:00
variableundefined
aee2f6772e Merge pull request #11217 from Fox-McCloud/reagent-bodytemp 
Tweaks Reagent Bodytemp Interaction
 2019-04-10 10:42:31 +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