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

35382 Commits

Author SHA1 Message Date
AffectedArc07
edd455e656 Merge pull request #14117 from TDSSS/wizcrash-fix 
Fixes #14116
 2020-08-20 13:58:14 +01:00
TDSSS
6b19caa08f Now with one less slash 2020-08-20 13:07:40 +02:00
TDSSS
1e895b374b derp in description 2020-08-20 01:12:46 +02:00
TDSSS
94e50ca22b Fixes my stupid mistake 2020-08-20 01:06:21 +02:00
AffectedArc07
3fb3353bc8 Merge pull request #14068 from ExusA/Spray-Fix 
Hydroponics Spray Fix
 2020-08-19 11:18:33 +01:00
ExusA
c1756fe7e3 Update code/game/objects/items/weapons/storage/belt.dm 
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2020-08-19 18:09:13 +08:00
AffectedArc07
820d6cf5e4 Merge pull request #14100 from SabreML/Cult-Shield 
Adds a shield overlay to the Empowered Cultist Robes
 2020-08-19 10:47:10 +01:00
AffectedArc07
ce0eb1fbdc Merge pull request #14003 from dearmochi/fix-lipsticks-draw-order 
Fix colored lips drawing over masks and random lipstick colouring
 2020-08-19 10:46:04 +01:00
mochi
346b54ad26 Fix random lipstick colour always defaulting to white 2020-08-19 10:20:14 +02:00
Fox McCloud
86909abcbe Merge pull request #14084 from AffectedArc07/pixel-offset-points 
Pixel Offset Points
 2020-08-18 15:31:18 -04:00
ExusA
9f62b5534b fixes indentation and duplicate code 2020-08-18 22:21:25 +08:00
AffectedArc07
9998f8bd3f Merge pull request #14061 from Kyep/holopara_ranged_attack_speed 
Ranged holoparasites no longer obliterate admin attack logs
 2020-08-18 15:20:03 +01:00
AffectedArc07
5037e43341 Merge pull request #14073 from ExusA/toy-descs 
Adds Figurine Descriptions
 2020-08-18 13:01:34 +01:00
AffectedArc07
233c60058d Merge pull request #13710 from dearmochi/overhaul-event-mob-selection 
Overhaul event mob selection
 2020-08-18 10:55:24 +01:00
AffectedArc07
892793caff Merge pull request #13631 from dearmochi/recharger-tweak-n-refactor 
Recharger tweaks and fixes
 2020-08-18 10:23:32 +01:00
mochi
c1d3d164fa Kyet stuff 2020-08-18 10:28:47 +02:00
mochi
44ea5ffaca Remove used-once var 2020-08-18 09:56:08 +02:00
Kyep
e635c84e70 queens, too 2020-08-17 22:45:32 -07:00
Kyep
c4f21d4da2 fixes green eggs bug 2020-08-17 22:37:10 -07:00
joep van der velden
ab853bed7c Merge remote-tracking branch 'upstream/master' into pull-move-rework 2020-08-17 21:35:35 +02:00
AffectedArc07
9eb9548cd8 Merge pull request #14094 from SteelSlayer/boo-log 
AoE spell attack logging tweak
 2020-08-17 16:35:37 +01:00
SteelSlayer
a9d94b7cbf AoE spell logging tweaks 2020-08-17 10:24:30 -05:00
AffectedArc07
160e6ed198 Merge pull request #14097 from SteelSlayer/mentor-pm 
Restores mentor's ability to PM people
 2020-08-17 16:08:54 +01:00
SteelSlayer
06ef8c94de Restores mentors ability to PM people 
This reverts commit 246daa0db12f56a320cdae6edf7b076b3f318f03.
 2020-08-17 10:00:49 -05:00
SabreML
93102c1a9d Adds shield effect to Shielded Robes 2020-08-17 15:16:41 +01:00
AffectedArc07
69cd58c1df Merge pull request #13934 from SabreML/Maint-Drone-Stuff 
Maintenance Drone Tweaks
 2020-08-17 13:35:59 +01:00
SabreML
de535bba3e Allows Robots to open and close extinguisher cabinets. 2020-08-17 13:15:21 +01:00
SabreML
814a1f9a4b Fix 2020-08-17 11:55:40 +01:00
SabreML
4203171739 Adds range check for drone shutdown. 2020-08-17 11:47:08 +01:00
AffectedArc07
a79724207d Merge pull request #12916 from farie82/pickle-whisperer 
Makes whispering hide your voice. And deaf people now can't see your voice
 2020-08-17 09:44:05 +01:00
AffectedArc07
2d1ba4ab56 Merge pull request #14005 from dearmochi/baton-refactor 
Telebaton fix, refactor and documentation
 2020-08-16 20:08:33 +01:00
AffectedArc07
f65e8f1d7f Merge pull request #13899 from dearmochi/flashbang-light-vfx 
Update flashbang FX and code clean-up
 2020-08-16 20:00:48 +01:00
AffectedArc07
5a463d22de Merge pull request #14019 from CornMyCob/gluttony 
Makes it so you can no longer synth the Gluttony's Blessing reagent
 2020-08-16 19:52:50 +01:00
mochi
8ef5d4070e undef 2020-08-16 20:16:46 +02:00
AffectedArc07
af8d14e1ee Merge pull request #14045 from dearmochi/auto-menders-fit-in-fridges 
Refactor Smart Fridges, allow auto-menders to be put in Medical Fridges
 2020-08-16 19:08:48 +01:00
ExusA
f0dc996149 Update belt.dm 2020-08-16 23:50:30 +08:00
ExusA
9401458416 actually what i meant to submit 2020-08-16 21:53:46 +08:00
mochi
7dac6c1391 Rename seed smartfridge, use access constants 2020-08-16 15:13:10 +02:00
AffectedArc07
1d9be53101 Merge pull request #14082 from Kyep/destroyer_fix 
Fixes destroyer borg lawsync, laws, sound
 2020-08-16 13:54:10 +01:00
AffectedArc07
67a5b66c9d Merge pull request #13551 from dearmochi/admin-additions 
View Asays, Erase Flavor Text and Use Random Name
 2020-08-16 13:50:22 +01:00
AffectedArc07
7f6d077994 Merge pull request #14080 from Kyep/refactor_exp_update 
Playtime DB update call refactor
 2020-08-16 13:49:37 +01:00
AffectedArc07
769bb7b17c Merge pull request #14025 from TDSSS/cows 
All cows are now female
 2020-08-16 13:47:23 +01:00
AffectedArc07
74741cfa11 Merge pull request #14024 from Kyep/admin_verb_reclassification 
Admin Verb Updates
 2020-08-16 13:46:49 +01:00
AffectedArc07
bb96a07d46 Merge pull request #13901 from Cocacolagua/get-rekt-slingos 
Prevents the Head of Personnel from rolling round-start shadowling
 2020-08-16 13:34:34 +01:00
dearmochi
59b8595534 Merge branch 'master' into admin-additions 2020-08-16 14:32:57 +02:00
AffectedArc07
b749fe5687 Merge pull request #13247 from farie82/logging-improvements-V2 
Makes logging based on ckeys. Adds dchat/LOOC/OOC logging
 2020-08-16 13:18:24 +01:00
AffectedArc07
07301da5d2 Merge pull request #13338 from Kyep/id_computer_demote_terminate_freejob 
ID Computer Demotion/Termination Upgrades
 2020-08-16 13:14:42 +01:00
AffectedArc07
354016c5cc Merge pull request #13150 from TheSardele/kick-confirmation 
Adds confirmation prompt to kicking
 2020-08-16 13:08:15 +01:00
AffectedArc07
57decdd4fb Merge pull request #13560 from farie82/convert-tickets 
Makes staff able to convert m/ahelp tickets to the other type
 2020-08-16 12:46:23 +01:00
Kyep
c660d28b96 squash 2020-08-15 17:04:37 -07:00