cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 10:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,590 Commits 26 Branches 2 Tags
adc33ef3a03f46a328d6fe6194cb5bd722dd6964
Commit Graph

32995 Commits

Author SHA1 Message Date
variableundefined
adc33ef3a0 Merge pull request #11783 from Couls/on-hit-effects 
[READY] Add on-hit effects for lasers and bullet holes for walls from TG
 2019-08-16 07:50:49 +08:00
Couls
13f1c99e16 remove magic number 2019-08-15 17:57:28 -04:00
variableundefined
f82adc1310 Merge pull request #11937 from farie82/Borgs-crate-rig-fix 
Rigging a crate now costs 15 coils instead of deleting your stack
 2019-08-16 00:33:20 +08:00
farie82
00d7eb7c3f Update crates.dm 2019-08-15 18:16:50 +02:00
variableundefined
b02cf43bd3 Merge pull request #11899 from SteelSlayer/cult-target-cryo-fix 
Cultists now get a new sacrifice target when the old one leaves the round via cryo
 2019-08-15 23:09:55 +08:00
SteelSlayer
d533d0ad87 Merge branch 'master' into wizard-mmi-fix 2019-08-15 09:05:36 -04:00
variableundefined
34bb102a37 Merge pull request #11767 from Arkatos1/pillbottle 
New Medical Directive - Colored Pillbottles!
 2019-08-15 11:17:46 +08:00
variableundefined
4525cd533b Merge pull request #11774 from Arkatos1/NodeArea 
Jump to Node ability now shows a location of each Blob node
 2019-08-15 10:52:55 +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
Tayyyyyyy
ff44a27ef6 Secure style attribute from XSS 2019-08-14 18:32:32 -07: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
9945c04f96 Merge pull request #11833 from dovydas12345/Chair 
Fixes being able to pick up chairs with full hands or without hands.
 2019-08-14 23:47:12 +08:00
variableundefined
0a97f8f5ba Merge pull request #11810 from Arkatos1/ButtonSwap 
Action button swapping
 2019-08-14 23:43:11 +08:00
variableundefined
96dcc6c0ef Merge pull request #11843 from JKnutson101/wallMedFixBranch 
Fixed Emergency NanoMed Vendors to no longer require a medical ID to access.
 2019-08-14 23:25:47 +08: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
Couls
7c5bdcc83c Merge remote-tracking branch 'upstream/master' into unrestricted-airlocks 2019-08-13 21:46:32 -04:00
Tayyyyyyy
f17798d95b FIx more garbled quotes 2019-08-12 22:08:08 -07:00
Tayyyyyyy
6c6ef64ccb Make img a bit more secure 2019-08-12 21:51:07 -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
f19e8aa58a conflicts 2019-08-12 18:47:11 +01: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
088f4921aa Merge https://github.com/ParadiseSS13/Paradise into ButtonSwap 2019-08-12 16:39:38 +02:00
Arkatos1
cedec38e9b Merge https://github.com/ParadiseSS13/Paradise into SlimeHUD 2019-08-12 16:38:33 +02:00
Arkatos1
a0c6983017 Merge https://github.com/ParadiseSS13/Paradise into NodeArea 2019-08-12 16:37:36 +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
71a5314d2f Merge pull request #11792 from iantine/mousesuicide 
Allows player controlled mice to suicide
 2019-08-12 17:53:42 +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
092fb980df Merge pull request #11564 from TDSSS/z-level 
Lets you teleport to z levels 9-12
 2019-08-12 16:42:49 +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
variableundefined
2b53fb0ab3 Merge pull request #11392 from Citinited/airlock-spawners 
Airlock spawners 2: Electric Boogaloo
 2019-08-12 13:30:26 +08: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