cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 05:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,775 Commits 26 Branches 2 Tags
4cc30536605ba8dcafe31e6a9be9d0e40e6091c8
Commit Graph

35342 Commits

Author SHA1 Message Date
AffectedArc07
d06a4612da Merge pull request #13988 from SteelSlayer/anchored-push-fix 
You can no longer push/swap places with anchored mobs
 2020-08-11 14:28:17 +01:00
AffectedArc07
1d4924aace Merge pull request #14014 from SteelSlayer/no-transfer-verb 
Hides the "Set transfer amount" verb on certain items like syringes
 2020-08-11 14:27:26 +01:00
AffectedArc07
a5d21b46d0 Merge pull request #14023 from dearmochi/wet-overlay-above-parallax 
Make wet overlays render on MID_TURF_LAYER plane
 2020-08-11 14:05:07 +01:00
mochi
902f29ddd7 use MID_TURF_LAYER 2020-08-11 14:40:41 +02:00
AffectedArc07
b5e3235015 Merge pull request #14041 from Kyep/cult_revert_12765 
Revert #12765 - make offstation roles immune to cult conversion rune again
 2020-08-11 13:13:44 +01:00
Kyep
cf2748509d prevent offstation_role people from triggering early summon 2020-08-11 05:07:01 -07:00
Kyep
e647433537 Fixes #13823 - blob mouse splatting 2020-08-10 16:06:18 -07:00
Kyep
3018e1109e verb simplification 2020-08-10 14:59:29 -07:00
Kyep
2a8df40741 AA requests 2020-08-10 12:53:14 -07:00
AffectedArc07
2e695ecf84 Merge pull request #13991 from Bizzonium/runtimeWires 
Fix runtime in wires.dm when holder is null
 2020-08-10 13:57:06 +01:00
AffectedArc07
3a749e77d1 Merge pull request #13946 from xProlithium/adminfreeze-clickprevention 
Click prevention for admin frozen players
 2020-08-10 09:45:25 +01:00
AffectedArc07
11f536915e Merge pull request #13958 from Kyep/ahelp_github 
Ahelp autoreply for Github issues
 2020-08-10 09:28:59 +01:00
mochi
a7741a980a Merge branch 'admin-additions' of https://github.com/dearmochi/Paradise into admin-additions 2020-08-10 09:31:56 +02:00
mochi
9db7f63082 Refreshing, adjust column widths 2020-08-10 09:31:17 +02:00
mochi
7efaaa68ee Merge branch 'master' into admin-additions 2020-08-10 09:09:15 +02:00
Kyep
898a23fa15 Fixes #14051 2020-08-09 12:44:36 -07:00
AffectedArc07
de08c23451 Merge pull request #14050 from Bizzonium/fixAdminDenyShuttle 
Fix absence of Toggle Deny Shuttle button
 2020-08-09 20:01:25 +01:00
Bizzonium
4a191de1b9 Fix absence of Admin Deny Shuttle button 2020-08-09 21:24:34 +03:00
AffectedArc07
02c7dfb707 Merge pull request #13997 from kugamo/Clarify-Vampire-Rejuvenate-Tooltip 
Changes desc of rejuvenate power
 2020-08-09 18:43:47 +01:00
AffectedArc07
cdd7d0bd51 Merge pull request #13887 from Mitchs98/flashout 
Correctly names the SGL-6 and SOB-3 Launchers
 2020-08-09 18:36:06 +01:00
AffectedArc07
110db94ce0 Merge pull request #13512 from trololiver112/hijack-hud 
Adds a custom antag hud icon to traitor hijackers
 2020-08-09 18:29:27 +01:00
AffectedArc07
c525c86cc7 Merge pull request #13851 from Fox-McCloud/cleanup-datastructures 
Cleans up Datastructures
 2020-08-09 18:23:43 +01:00
AffectedArc07
9edea622c4 Merge pull request #13849 from Fox-McCloud/remove-unused-code 
Removes Unused Turntable Code
 2020-08-09 18:22:54 +01:00
AffectedArc07
0aa89bd3de Merge pull request #13748 from Fox-McCloud/rig-purge 
Purges Rigs
 2020-08-09 18:21:39 +01:00
mochi
a37dc85fc5 Medical Fridge accepts auto-menders 2020-08-09 10:22:18 +02:00
Kyep
15e8466592 Revert #12765 2020-08-08 13:51:33 -07:00
AffectedArc07
96840368d4 Merge pull request #13674 from Fox-McCloud/remove-atc 
Removes Excessive Automated Yakking
 2020-08-08 21:18:44 +01:00
SteelSlayer
04740436b2 hides the verb for automenders too 2020-08-08 13:18:17 -05:00
SteelSlayer
e18c3ec598 Merge branch 'master' into no-transfer-verb 2020-08-08 13:11:51 -05:00
AffectedArc07
601a5db433 Merge pull request #13378 from Fox-McCloud/applicator-tweaks 
Applicator QoL Tweaks
 2020-08-08 16:53:18 +01:00
joep van der velden
1de92a3d06 length instead of ?.len 2020-08-08 17:35:51 +02:00
AffectedArc07
c99c56411d Merge pull request #14034 from farie82/throw-and-fruit-logging 
Improves botany fruit logging. Makes throws not spam admins when the item does no damage
 2020-08-08 16:34:47 +01:00
joep van der velden
c430b6e1e6 Merge remote-tracking branch 'upstream/master' into logging-improvements-V2 2020-08-08 17:30:09 +02:00
AffectedArc07
7a3beeaeb2 Merge pull request #14036 from Kyep/offstation_role_fix 
Fixes offstation_role bug
 2020-08-08 16:28:02 +01:00
AffectedArc07
fcd6f900b9 Merge pull request #13175 from farie82/logging-improvements 
Logging view improvements
 2020-08-08 16:23:06 +01:00
Kyep
4bcbb65b37 disables dragon transformation because it freezes the server 2020-08-08 07:43:35 -07:00
Kyep
dbbb226a27 fix offstation_role bug 2020-08-08 06:24:29 -07:00
joep van der velden
d89572afee review changes 2020-08-08 07:39:25 +02:00
joep van der velden
f4910dcc79 Makes grown/On_Consume actually work properly 2020-08-08 00:03:16 +02:00
joep van der velden
0cccd0ebf0 Improves botany fruit logging. Make throw logging more logical 2020-08-07 23:55:11 +02:00
AffectedArc07
6794efe582 Merge pull request #14029 from Kyep/mass_hallucination_fix 
Fixes mass hallucination event affecting other zlevels
 2020-08-07 20:02:30 +01:00
Kyep
acaa8db9df fix spacing 2020-08-07 08:26:55 -07:00
Kyep
6d346ad6b6 Update code/modules/admin/topic.dm 
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2020-08-07 14:46:09 +00:00
Kyep
0c33fc1eb7 mass hallucination event only affects station 2020-08-07 07:31:42 -07:00
Kyep
1fa9862a20 Update code/modules/power/singularity/narsie.dm 
Co-authored-by: AffectedArc07 <josephcase55@hotmail.com>
 2020-08-07 13:31:47 +00:00
Kyep
c0f98deeab Fixes cult summon runtime 2020-08-07 06:26:03 -07:00
TDSSS
460c7e0f4c cows are female 2020-08-07 14:15:34 +02:00
Kyep
dabfb91b88 admin verb permissions update 2020-08-07 04:51:00 -07:00
AffectedArc07
606e661ab5 Merge pull request #13523 from dearmochi/fix-stuff 
Minor fixes: Cmd. amplification, nitroglycerin reagent
 2020-08-07 12:48:27 +01:00
mochi
e2d554202a use default null 2020-08-07 13:34:09 +02:00