Commit Graph

2039 Commits

Author SHA1 Message Date
Tigercat2000
fe5fb2c0f8 Merge remote-tracking branch 'upstream/master' into job_refactor_tg 2017-02-25 05:42:47 -08:00
Crazy Lemon
4c14385b67 Merge pull request #6534 from Kyep/bless_smite_logging
Adds logging to admin use of Smite/Bless
2017-02-24 12:06:09 -08:00
Crazy Lemon
bc3e785586 Merge pull request #6564 from Markolie/fixxxxx
Fix station goals runtime and increase meteor shield satellite goal tenfold
2017-02-23 03:20:37 -08:00
Kyep
b0a6ad2241 Removes "src." 2017-02-21 22:06:06 -08:00
Markolie
9cde629caf Fix station goals runtime and increase goal tenfold 2017-02-21 22:52:16 +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
KasparoVy
11d759550c Moves Species-Specific Object Icons into their own Files, Fixes Armalis Equipment Bug
All species-specific clothing icons (obj and worn) are now in their own files instead of cluttering up the main ones. I didn't do the Skrell helmets/whatevers because Humans can wear them too.

Fixes a bug where the 'select equipment' debug verb wouldn't correctly equip Armalis if you selected the 'Vox' option. Also corrects an issue where it gave the Armalis two uniforms. Adds a placeholder invisible uniform icon state for the Armalis so Admins can use 'em for events and do uniform-related things without having to deal with terribly awkward icons.
2017-02-20 07:08:19 -05: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
Mark van Alphen
f42b9cf383 Merge branch 'master' into admin_interact 2017-02-18 15:41:16 +01: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
Tigercat2000
e7023fd032 Refactored 'select equipment' to use outfit datums
Also moved outfit datum files to code/datum/outfits/, because I had
nowhere better to put all of the admin equipment- job stuff is still
with jobs
2017-02-17 16:17:59 -08:00
Tigercat2000
14ba6fded6 Ported /tg/'s outfit datums, refactored job controller to support them
Players:
 - The only thing that you should notice is that your backpack options
 have changed. Instead of being "None", "Backpack", "Satchel", and
 "Satchel Alt", there are 6 options:
   - "Grey Backpack": Ensures you always recieve a plain grey backpack.
   - "Grey Satchel": Same as the above, grey, plain, satchel.
   - "Grey Dufflebag": So you don't have to rush the locker room, I
   guess. Just kinda ransacked it from /tg/. Happy to revert it, please
   do not post a five paragraph text wall calling me a shitlord
   powergaming hitler-loving furry.
   - "Leather Satchel": It's a leather satchel. What the hell did you
   think it was?
   - "Department Backpack": Gives you the department's default backpack.
   Grey for most jobs.
   - "Department Satchel": It gives you the department's default
   satchel; A grey satchel if the department doesn't have one.

Coders:
 - The above means this needs a minor SQL change:
   ```
   SQL goes here
   I'll write a query later
   Can't be bothered now
   Kill me please
   ```

 - This is a cleaner method of handling job equipment than
 "M.equip_or_collect" x 1000. Jobs specify a '/datum/outfit' datum,
 which defines all of the things to equip to the user.

 - Minor note: equip_or_collect will no longer ever generate a plastic
 bag. It will instead just drop stuff on the floor if it can't stuff it
 into a mob. If this is even slightly a point of contention, more than
 happy to revert it; It was just requested by Fox.
   - Addendum: This also has the effect of making it so that labcoats
   are just thrown onto the floor if you have a loadout suit. It's not
   really avoidable. Uniforms and suits are equipped before the
   backpack.

 - Changes from /tg/:
   - Changed all of the "H.equip_to_slot_or_del" calls into invoking a
   new "equip_item" proc; This is used to support a new variable called
   "collect_not_del". Job outfits use this, it makes it so that the
   system calls equip_or_collect instead of equip_to_slot_or_del. The
   idea being that job items should never be lost to the void,
   especially because they can conflict with loadout items.

TODO:
 - Retrofit "Equip Mob" verb to use this for all of the non-job options
 - Fully implement head announcements(?)
   - May be best for a second PR that addresses all of the real issues
   with our current job system

( Now go reread that SQL code block :) )
2017-02-17 11:35:45 -08: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
Crazy Lemon
c665d91448 Merge pull request #6409 from Kyep/smite
Adds Bless & Smite options for prayers
2017-02-14 13:29:29 -08:00
Crazy Lemon
eaa0316eed Merge pull request #6434 from Kyep/check_antags_ert
Adds ERT to Check Antagonists
2017-02-14 13:24:12 -08:00
Crazy Lemon
1e84d34559 Merge pull request #6351 from tigercat2000/goonchat_administrator_tools
Goonchat Admin Filters
2017-02-14 13:09:24 -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
Kyep
cdf35ce9da fixes merge conflict 2017-02-13 22:27:06 -08:00
Kyep
836d62864f Lets mentors see playtime
Mentors can already see a list of all players by account age. This
includes antags with obvious names, like "Donk Co. Operative #1".

This PR changes the permissions on the playtime report (the one which
shows how much playtime everyone has) so mentors can see that, too.

The idea being that this enables mentors to distinguish between "X has
an old account" and "X has a lot of experience on paradise". Currently,
mentors cannot distinguish the two.

Also, consistency. If mentors can see players' account registration age,
they should also be able to see players' playtime experience.
2017-02-13 01:16:13 -08:00
Kyep
3aeb37eedb Adds ERT to Check Antagonists 2017-02-12 23:55:48 -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
f701813f6e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into admin_interact
# Conflicts:
#	code/modules/client/client defines.dm
2017-02-12 00:03:49 +01:00
Markolie
4d857de148 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals
# Conflicts:
#	icons/effects/beam.dmi
2017-02-11 18:26:06 +01:00
Kyep
9f20cb1685 Fixes merge conflict in event_container 2017-02-10 22:07:05 -08:00
Markolie
2afd77a54a Split admin interaction into regular and advanced, make more devices ghost-interactable 2017-02-09 19:30:36 +01:00
Markolie
28244f8f46 Fix compile issue 2017-02-09 01:00:23 +01:00
Markolie
3077fb42bf Add logging to opening/closing job slots and hacking bots 2017-02-09 00:56:05 +01:00
Markolie
4a155bfb50 Admin interaction update 2017-02-08 23:27:08 +01:00
Tigercat2000
c0d3855d53 Goonchat Admin Filters
This adds Message filters to Goonchat (only for mentors +
administrators).

There is a new option in the settings dropdown of Goonchat to access
these. They are temporary, non-destructive filters which will hide all
messages matching them that are already in your chat, as well as any new
messages matching them.

There are 5 filters currently:
 - Admin; Filters out most admin logs.
 - Combat; Filters out a limited subset of combat messages-
 Specifically, any message with the 'combat' span class. Currently, this
 has only been added to the central /attack and /attacked_by procs, so a
 large considerable amount of hostile actions taken against a
 player are still not going to be filtered out. We can work on adding
 the identifier to more stuff later.
 - Radios: Filters out all radio messages.
 - Speech: Filters out all mob speech.
 - OOC: Filters out OOC chat.

There is also an "All" option, which just turns off all messages that
are not internal to Goonchat.
2017-02-06 12:19:33 -08:00
Markolie
5deafdb4e5 Fix Destroy() return, replace set_dir with setDir 2017-02-06 20:44:12 +01: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
2b767bb9c9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/modules/mob/mob_helpers.dm
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/storage.dmi
2017-01-31 17:44:38 +01:00
Fox McCloud
0874ea7295 Merge pull request #6152 from uraniummeltdown/windowflash
Window Flashing
2017-01-31 01:30:39 -05:00
Kyep
46f409ddfb Fixes some mobs being invisible in Check_antagonists 2017-01-28 15:25:20 -08:00
Markolie
62afefaf2c Further station goal fixes, fix communication computer messages 2017-01-24 22:07:12 +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
a7205cfd3e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/projectiles.dmi
2017-01-23 17:36:37 +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
Crazylemon64
d945229fcb Ports over tg's map conflict helping script 2017-01-18 20:27:00 -08:00
Crazy Lemon
2a209f62cd Merge pull request #5814 from Markolie/ann2
Announcement refactor
2017-01-18 19:17:30 -08:00
Fox McCloud
03e3f1d624 Merge pull request #6169 from Aurorablade/KALIMAH
Bugsie 3
2017-01-18 18:52:19 -05:00
Aurorablade
9f1037006d Changes and more shit i noticed... 2017-01-17 23:45:47 -05:00