cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 04:02:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,570 Commits 26 Branches 2 Tags
d533d0ad87b0d96c1ed69cde5ee00aabdacb4827
Commit Graph

20415 Commits

Author SHA1 Message Date
variableundefined
34bb102a37 Merge pull request #11767 from Arkatos1/pillbottle 
New Medical Directive - Colored Pillbottles!
 2019-08-15 11:17:46 +08:00
variableundefined
a5e94c6e72 Merge pull request #11776 from Arkatos1/SlimeHUD 
SlimeHUD
 2019-08-15 10:37:12 +08:00
Fox McCloud
5d9fc8e9ea Merge pull request #11985 from Tayyyyyyy/admin_pencode 
Add admin pencode: style, class, and img
 2019-08-14 22:22:34 -04:00
Fox McCloud
b3423eac2f Merge pull request #11984 from Markolie/ruinsport 
Netherworld portal fix and butler pick time increase
 2019-08-14 20:02:29 -04:00
Fox McCloud
a0203a60ac Merge pull request #11965 from TDSSS/talisman-icons 
Give cult talisman different icons
 2019-08-14 19:48:54 -04:00
variableundefined
353f0e0b3b Merge pull request #11844 from JKnutson101/cyborgSuccumbBranch 
Gave Cyborgs with 0 battery left the ability to succumb.
 2019-08-14 23:25:16 +08:00
variableundefined
3f990b50ea Merge pull request #11980 from TheSardele/drunk-sleep 
Fixes sleeping drunk making you more drunk
 2019-08-14 14:22:30 +08:00
Tayyyyyyy
f17798d95b FIx more garbled quotes 2019-08-12 22:08:08 -07:00
variableundefined
9097eb0e1d Merge pull request #11741 from AzuleUtama/chameleonGlasses 
Traitor thermals and security HUD now use updated chameleon code, Slight buff to the thermals
 2019-08-13 12:06:39 +08:00
variableundefined
80921a3ba4 Merge pull request #11807 from Tayyyyyyy/ert_tweaks 
Randomized ERT priority + drag and drop role selection
 2019-08-13 08:43:22 +08:00
AzuleUtama
27ff82eb03 adds the truth 2019-08-12 18:41:33 +01:00
variableundefined
bbaf765279 Merge pull request #11949 from florkeger/hierophant-layer-fix 
Hierophant layer fix
 2019-08-13 00:50:05 +08:00
Tayyyyyyy
48c002b361 Add admin pencode: style, class, and img 2019-08-12 09:47:59 -07:00
variableundefined
0bb1ba6eae Merge pull request #11830 from Emanthealmighty/AIchange 
AI can now change its intent
 2019-08-12 23:08:58 +08:00
Arkatos1
cedec38e9b Merge https://github.com/ParadiseSS13/Paradise into SlimeHUD 2019-08-12 16:38:33 +02:00
Arkatos1
bddc7132c2 Merge https://github.com/ParadiseSS13/Paradise into pillbottle 2019-08-12 16:36:43 +02:00
variableundefined
c8e0dee631 Merge pull request #11735 from AffectedArc07/panic-bunker 
Panic Bunker
 2019-08-12 19:34:19 +08:00
variableundefined
f6505a6fd5 Merge pull request #11819 from Kyep/medals 
Department Medals
 2019-08-12 17:52:22 +08:00
variableundefined
635db54625 Merge pull request #11730 from farie82/afk-list 
Adds a list AFK players verb for admins
 2019-08-12 17:48:33 +08:00
variableundefined
0b469ce563 Merge pull request #11577 from farie82/mhelp-take 
Ticket take now asks for a confirmation if it's already assigned + ticket/PM code refactor
 2019-08-12 17:44:26 +08:00
variableundefined
98b821c120 Merge pull request #11637 from datlo/lavalandgolemsintospace 
Move free golems to lavaland, let them move shuttle still
 2019-08-12 17:42:40 +08:00
variableundefined
d59b09c382 Merge pull request #11539 from farie82/Fix-weird-identity-issues 
Fixes weird identity problems
 2019-08-12 14:54:26 +08:00
variableundefined
ec39d864bf Merge pull request #11988 from Tayyyyyyy/input_fixes 
Fix input sanitization issues
 2019-08-12 14:39:14 +08:00
Tayyyyyyy
90bbc01cf4 Fix input sanitization issues 2019-08-11 22:40:16 -07:00
unknown
1e12cae6a5 Per Couls advice, removed the CanSuccumb verb and now borgs are considered InCritical when in low power mode 2019-08-11 23:45:49 -04:00
Fox McCloud
940f87b210 Merge pull request #11942 from Couls/clown-buff 
Waddling component, clowns can now choose to waddle while they walk, penguins automatically waddle
 2019-08-11 20:54:04 -04:00
Couls
5345de448b review fix 2019-08-11 20:18:34 -04:00
Fox McCloud
ed3da6d611 Merge pull request #11693 from improvedname/lasgansan 
Garfield you fat cat!, adds lasagna 2
 2019-08-11 20:06:22 -04:00
Fox McCloud
a15c9fd932 Merge pull request #11865 from Couls/resource_urls 
change preload_rsc value to set right before resources are sent
 2019-08-11 20:04:22 -04:00
Fox McCloud
d46b3f1528 Merge pull request #11953 from Couls/invismin 
bring invismin back to F9
 2019-08-11 19:51:21 -04:00
Mark van Alphen
709163ee8c Increase butler pick time, fix destruction of netherworld portal 2019-08-12 00:41:06 +02:00
Fox McCloud
fcc137500a Merge pull request #11919 from florkeger/freeze-name-fix 
Updated admin freeze text
 2019-08-11 17:08:19 -04:00
Fox McCloud
586d079c57 Merge pull request #11837 from datlo/hijacknewcrit 
Newcrit users in hard crit no longer interrupts hijack
 2019-08-11 17:03:08 -04:00
Fox McCloud
ddf8278c1a Merge pull request #11908 from Ionward/greyundies 
Grey Underwear Resprite
 2019-08-11 16:52:50 -04:00
Fox McCloud
84d01f44ce Merge pull request #11889 from Couls/hecking-orebox 
Automatically offload ore to orebox when pulling one
 2019-08-11 16:51:05 -04:00
Couls
6790d65da4 review fix 2019-08-11 16:48:54 -04:00
Fox McCloud
5dc90cfb6e Merge pull request #11885 from TheSardele/pod-pilor-sec-armband 
Allows pod pilots to start with security armbands
 2019-08-11 16:48:04 -04:00
Fox McCloud
c3abe952ac Merge pull request #11884 from TheSardele/bee-nuzzle 
Makes bees not inject venom when nuzzling
 2019-08-11 16:47:39 -04:00
Fox McCloud
5fcbfe41fa Merge pull request #11841 from Crazylemon64/fix_cheaty_ghosts 
Fixes an exploit allowing ghosts to teleport their bodies
 2019-08-11 16:41:43 -04:00
Fox McCloud
fbbf9c42e0 Merge pull request #11765 from Couls/butcher-koi 
Allow koi to be butchered
 2019-08-11 16:36:58 -04:00
Fox McCloud
3634687a88 Merge pull request #11374 from Quantum-M/removeTeleBoards 
Removes telescience boards from RnD
 2019-08-11 16:28:47 -04:00
datlo
d329f04ae6 Merge branch 'master' into lavalandgolemsintospace 2019-08-11 16:12:28 +02:00
variableundefined
0b04d71445 Merge pull request #11515 from Tayyyyyyy/sanitize 
Sanitize all inputs
 2019-08-11 22:09:10 +08:00
variableundefined
a73fbf71ed Merge pull request #11698 from Kyep/rip_lavaland_attack_logs 
Hides admin attack logs involving NPCs, lavaland syndiebase, adminroom, thunderdome
 2019-08-11 16:49:54 +08:00
Kyep
977087a97e fixes merge conflict 2019-08-11 01:36:09 -07:00
variableundefined
b3b29b40be Merge pull request #11666 from CornMyCob/cursed-heart-fix 
cursed heart fix
 2019-08-11 16:34:15 +08:00
variableundefined
9eff8a8663 Merge pull request #11696 from Markolie/shuttlechairs 
Add shuttle chairs (and fix newlines on all maps)
 2019-08-11 16:32:14 +08:00
variableundefined
ae70cbfe41 Merge pull request #11606 from Markolie/ghostqol 
Observer/hud improvements and fixes
 2019-08-11 16:23:23 +08:00
variableundefined
d5ba74c1ba Merge pull request #11612 from farie82/viro-clear-and-eject 
The Empty beaker button from the pandemic now also ejects
 2019-08-11 15:01:25 +08:00
TheSardele
82c46e6232 Fixes sleeping drunk making you more drunk 
Sleeping drunk used to make you even more drunk, despite what the comment stating the contrary. Now, you become less drunk while sleeping depending on how comfortable you are.
 2019-08-10 23:46:47 +02:00