Commit Graph

317 Commits

Author SHA1 Message Date
Fox-McCloud
6ec234430e Merge remote-tracking branch 'upstream/master' into lungsss
# Conflicts:
#	code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
#	code/modules/mob/living/carbon/carbon_defines.dm
2017-11-18 18:49:47 -05:00
tigercat2000
12949e24f8 Merge pull request #8184 from Birdtalon/ticket-machine
Birdtickets: Adminhelp based ticket system
2017-10-27 09:24:06 -07:00
Kyep
faa6788b80 "var X" -> "var/x" 2017-10-19 08:28:31 -07:00
Kyep
5f66da051a Also tells you if you're toggling on/off 2017-10-16 22:20:48 -07:00
Kyep
168f6799db Tiger 2017-10-16 20:38:46 -07:00
Kyep
6f5160775b Permissions Panel Loop 2017-10-16 20:31:59 -07:00
Birdtalon
550db12717 user feedback, updates adminhelp string, replying to a ticket stops stale counter 2017-10-01 23:18:51 +01:00
Fox-McCloud
003277a89d Merge remote-tracking branch 'upstream/master' into lungsss 2017-09-17 01:02:33 -04:00
Fox McCloud
13c112358a Merge pull request #7534 from Kyep/ssd_button
Admin 'List SSDs' verb & cryo option
2017-08-16 19:58:52 -04:00
Fox-McCloud
4479185d6e Merge remote-tracking branch 'upstream/master' into lungsss 2017-08-16 19:20:19 -04:00
Fox-McCloud
9d14e6c9da Merge remote-tracking branch 'upstream/master' into lungsss
# Conflicts:
#	code/modules/mob/living/carbon/alien/humanoid/life.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station.dm
#	code/modules/surgery/surgery.dm
2017-08-05 19:03:52 -04:00
Kyep
568874ed6a Fixes #7925 for smite/bless and SIT 2017-08-05 01:58:53 -07:00
Fox McCloud
d4f305cc72 Merge pull request #7583 from Kyep/smite_hunter
Expands Smite / Dark Priest to cover many characters
2017-07-25 12:24:45 -04:00
Kyep
de56e4bf59 Removed is_hunter_outfit 2017-07-19 02:03:21 -07:00
Fox-McCloud
77375fc1c4 Breathing is Now Handled on Lungs 2017-07-19 03:28:21 -04:00
Kyep
31723393d2 Fixes merge conflict 2017-06-27 22:11:23 -07:00
Kyep
62bc56a080 Adds jani/paranormal ERT and more 2017-06-26 01:55:15 -07:00
Kyep
ce48a277df Support protective hunters, guardian/pet blessings 2017-06-24 00:04:15 -07:00
Fox McCloud
19a932ddfa Merge pull request #7551 from Kyep/ga_smitebless
Changes Smite/Bless to require R_EVENT permissions
2017-06-23 01:08:52 -04:00
Kyep
250b64edb2 Changes Dark Priest to Hunter 2017-06-18 23:48:51 -07:00
Kyep
ec3e3417ef Changes Smite/Bless to require game admin permissions 2017-06-14 04:03:40 -07:00
Sam
fca8a46c49 Fixes errant improper capitalised references 2017-06-14 08:00:18 +01:00
Kyep
5c2aa2208e Changed to list players, and have individual cryo buttons 2017-06-12 00:20:18 -07:00
Fox McCloud
110778795c Merge pull request #7486 from Alexshreds/meta
Mhelp Fix
2017-06-09 19:47:50 -04:00
Kyep
e29bd33637 DP's Radio & Pinpointer are now NODROP. 2017-06-08 22:12:56 -07:00
Kyep
b241af77b8 Added 'Priest' option 2017-06-07 00:32:35 -07:00
Kyep
4f66591eee Fox requests 2017-06-06 20:08:59 -07:00
Chakirski
abbee964a1 meta 2017-06-06 14:34:07 -05:00
Kyep
efd4bb5594 Fox requests 2017-06-04 21:29:25 -07:00
Kyep
604270a44f More Smiting
Updates the admin "smite" command, adding several new options for
dealing with people who keep annoying the gods with requests for
freebies:
- Mutagenic & hellwater cookies are now NODROP, so not as easy to get
rid of.
- Adds a 'Hallucinate' option, which triggers chronic hallucinations.
- Adds a 'Starvation' option, which causes chronic hunger. (and
slowdown)
- Adds an 'Assassin' option, which creates a new traitor with an
objective to kill them.
- Adds a 'Lynch' option, which gives everyone without mindshields a
directive to kill them.
- "Bless" and "Smite" now show up as options in the player panel.
2017-06-04 20:20:51 -07:00
Mark van Alphen
b0ded4b821 Merge branch 'master' into findnreplace 2017-03-05 12:09:52 +00:00
Kyep
b0a6ad2241 Removes "src." 2017-02-21 22:06:06 -08:00
Markolie
6982014a6e Replace all BYOND text macros 2017-02-21 15:41:37 +01:00
Kyep
cae061dcf0 Tigercat request 2017-02-20 17:54:43 -08:00
Kyep
5a5a8b6c36 [M] -> [key_name_admin(M)] 2017-02-20 17:03:37 -08:00
Kyep
c562e4304c Adds logging to admin use of SMITE/BLESS
Admin usage of smite/bless is now logged. All other admins (plus
adminlog) can see it.
2017-02-20 03:35:21 -08:00
Fox McCloud
8503211af8 Merge pull request #6410 from Kyep/ahelp_take
Adds 'take ahelp' option on ahelp/mhelp
2017-02-18 08:30:14 -05:00
Fox McCloud
ce50279b73 Merge pull request #6436 from Kyep/playtime_for_mentors
Lets mentors see playtime
2017-02-18 08:29:25 -05:00
Fox McCloud
e0b23a1e10 Merge pull request #6421 from tigercat2000/library
Improve View Flagged Books admin verb
2017-02-17 14:01:28 -05:00
Mark van Alphen
dea264faf2 Merge branch 'master' into stationgoals 2017-02-17 18:05:15 +01:00
Tigercat2000
52b0f94bb7 I test all of my code 👍 2017-02-16 16:14:35 -08:00
Tigercat2000
e433e0283d Add sanitizeSQL 2017-02-16 16:06:00 -08:00
Kyep
b7855481f6 Fixes & Improvements
- Makes new players be listed first in the Check Playtime list, so they
are easy to find.
- Fixes a bug with mentor playtime list not actually working for
mentors.
- Fixes the Check Player Age panel not having working "FLW" links, and
potentially showing antag status to mentors.
2017-02-13 23:12:57 -08:00
Tigercat2000
1cfbeaeddb Improve View Flagged Books admin verb
This changes the "View Flagged Books" admin verb into a datum/browser
UI. You can see all the books that have been flagged from here, review
them, and remove the flagged status or delete them.

Also refactors pencode into some __HELPER procs, and adds a
"reverse-pencode" proc. It's not perfect, due to the complexity of HTML
and my unwillingness to use BYONDregex, but it's good enough to get the
general idea of the formatting across. It's used for the new "view book"
panel.
2017-02-12 08:44:48 -08:00
Kyep
a602c1d8da Adds 'take ahelp' option on ahelp
Adds a 'take' option to ahelps and mentorhelps. Can be used by
admins/mentors to quickly let the asker know their ahelp/mhelp is being
dealt with. Other admins/mentors can see it too, so it should reduce the
dogpiling effect where every online admin/mentor answers at once.

Based on: https://github.com/Baystation12/Baystation12/pull/15902/files
2017-02-11 21:15:44 -08:00
Kyep
bcc596361c Adds Bless & Smite options for prayers
This PR adds two new responses admins can give to prayers: BLESS and
SMITE.

Possible BLESSings:
- Teleport to arrivals
- Moderate, instant heal
- Heal Over Time*
- Permanent Regeneration power*
- Super Powers* (regen, nobreath, coldresist)

SMITE options:
- Lightning bolt (~75 burn damage)
- Brain damage* (75 brain damage, human only)
- Fire Death (150 fire damage + hotspot, instant death)
- Honk Tumor* (inserts honk tumor, human only)
- Cluwne* (makes them into a cluwne, like wizard spell, human only)
- Mutagen Cookie*
- Hellwater Cookie*
- Gib

Options mark with * only work on humans. The rest work on simple_mobs
also.
2017-02-11 20:34:16 -08:00
Markolie
f2497afd9d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals
# Conflicts:
#	_maps/map_files/cyberiad/z2.dmm
#	code/__DEFINES/is_helpers.dm
#	code/__DEFINES/misc.dm
#	code/_globalvars/lists/objects.dm
#	code/modules/mob/living/living_defines.dm
#	icons/effects/beam.dmi
2017-02-05 20:12:51 +01:00
Markolie
14dc136fe8 Further station goal updates 2017-01-24 20:24:29 +01:00
Markolie
a06c997629 Add Station Goals
Still to-do:
* Remove old BSA computer.
* Add NanoUI interfaces for all goals.
* Test it.
2017-01-23 22:02:29 +01:00
Markolie
a50a3d59b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi
2017-01-20 23:43:35 +01:00