Commit Graph

35302 Commits

Author SHA1 Message Date
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
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
Kyep
87f0b423df Fixes destroyer borg lawsync, laws, sound 2020-08-15 00:34:04 -07:00
Kyep
7dad849cfe squash 2020-08-14 13:33:15 -07:00
Kyep
c406f0f851 EXP system minor refactor 2020-08-14 13:23:22 -07:00
mochi
a7e1cc4830 Smart spans 2020-08-13 11:12:08 +02:00
AffectedArc07
50cd3b9c7d Merge pull request #14057 from Kyep/fixes_13823_blob_mouse_splat
Fixes blob mouse splatting, refactors mice a bit
2020-08-13 09:15:14 +01:00
Kyep
e4bb9d6561 re-adds splatting, but simplified 2020-08-12 20:32:26 -07:00
AffectedArc07
dfad0c955d Merge pull request #14069 from ExusA/barstool
Barstool crafting fix
2020-08-12 19:31:16 +01:00
ExusA
0f95e7308f Revert "Fixes hydro sprays"
This reverts commit 266939684f.
2020-08-12 23:21:20 +08:00
ExusA
ee65493c3f Update sheet_types.dm 2020-08-12 23:20:48 +08:00
ExusA
266939684f Fixes hydro sprays 2020-08-12 20:09:53 +08:00
Kyep
298c4ee86b map template load/unload require R_DEBUG now 2020-08-11 21:45:19 -07:00
mochi
954c76774d Refactor Smart Fridges 2020-08-12 01:16:12 +02:00
dearmochi
427169da6e Merge branch 'master' into wet-overlay-above-parallax 2020-08-11 17:24:37 +02:00
mochi
67df1bf5ff Add FLOOR_OVERLAY_PLANE (and use that for wetness) 2020-08-11 17:22:27 +02:00
joep van der velden
4554340b7c Add warning no staff online for converted ticket 2020-08-11 17:01:09 +02:00
Kyep
5e887d6eef Revert "Make wet overlays render on MID_TURF_LAYER plane" 2020-08-11 14:54:18 +00:00
AffectedArc07
09ef06a7ec Merge pull request #13896 from Kyep/sleeper_teleport_fix
Fixes issues with machines/mechs when a person is teleported out of them
2020-08-11 14:29:41 +01:00
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