Commit Graph

287 Commits

Author SHA1 Message Date
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
Crazy Lemon
2a209f62cd Merge pull request #5814 from Markolie/ann2
Announcement refactor
2017-01-18 19:17:30 -08:00
Aurorablade
9f1037006d Changes and more shit i noticed... 2017-01-17 23:45:47 -05:00
Aurorablade
90b5177f4e Rawr 2017-01-14 01:48:44 -05:00
Markolie
f4c4bfe288 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__HELPERS/unsorted.dm
#	code/_globalvars/lists/objects.dm
#	code/controllers/verbs.dm
#	code/game/gamemodes/cult/ritual.dm
#	code/game/gamemodes/cult/runes.dm
#	code/game/objects/items/stacks/sheets/sheet_types.dm
#	code/modules/mob/spirit/mask/mask.dm
#	code/modules/mob/spirit/viewpoint.dm
#	icons/effects/96x96.dmi
#	icons/effects/effects.dmi
#	icons/mob/actions.dmi
#	icons/obj/weapons.dmi
#	icons/obj/wizard.dmi
#	icons/turf/floors.dmi
2017-01-06 16:36:46 +01:00
Crazylemon64
ec0f13d41e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2017-01-06 05:01:43 -08:00
Crazy Lemon
7e0183f23f Merge pull request #5224 from Kyep/jobs_unlock_system
Playtime Tracking
2017-01-03 18:06:28 -08:00
Aurorablade
98b7a89a17 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
# Conflicts:
#	code/game/machinery/doors/airlock.dm
2016-12-29 11:01:43 -05:00
Markolie
01f2c85347 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/game/dna/genes/goon_powers.dm
#	code/game/dna/genes/vg_powers.dm
#	code/game/objects/effects/overlays.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/statue.dm
#	code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
#	icons/mob/back.dmi
#	icons/obj/storage.dmi
2016-12-23 19:32:19 +01:00
Markolie
e2587dbbbf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
# Conflicts:
#	code/game/gamemodes/events.dm
#	code/modules/awaymissions/bluespaceartillery.dm
2016-12-23 19:04:35 +01:00
Crazylemon64
6d3e66f41c Polishes up the reset_view proc, which is basically
`reset_perspective` from tgstation.

Also adds various support for remote viewing lenses - like cameras not
transmitting xray vision, among other things

Recommit because we're using different compiler versions
2016-12-21 17:56:57 -08:00
Kyep
7b20d7561e Merge remote-tracking branch 'ParadiseSS13/master' into jobs_unlock_system 2016-11-28 22:19:27 -08:00
Kyep
3865213358 Crazylemon changes
- Adds UID
- Removes cats
- Adds .Join
2016-11-28 22:19:07 -08:00
Aurorablade
0c637cebfa Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub 2016-11-22 01:48:56 -05:00
Crazy Lemon
f215041315 Merge pull request #5893 from Fox-McCloud/event-cleanup
Removes Event Procs
2016-11-21 16:51:16 -08:00
Fox-McCloud
9ace0245cf Removes Event Procs 2016-11-16 07:14:08 -05:00
Aurorablade
5d392b36a4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-11-15 15:30:36 -05:00
Fox-McCloud
fcc20ac6bc BSA Tweaks 2016-11-09 22:36:03 -05:00
Markolie
ffc74cda0a Announcement fixes, change most command announcements to event announcements 2016-10-25 15:21:16 +02:00
Markolie
2e711d1337 Lay groundwork for megafauna, and add Ashdragon.
Includes a refactor for gun turrets (merged into portable turrets), hostile simple_animal behaviour, spells (sounds have been added) and poi_list items.
2016-10-23 23:15:57 +02:00
Aurorablade
e2ce799aa1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-08 22:21:48 -04:00
Kyep
7e613798b0 Fixes merge conflict in admin_verbs.dm 2016-10-01 13:26:24 -07:00
Fox McCloud
c56961f6f0 Merge pull request #5642 from Krausus/UniqueIDs
Adds Unique Identifiers with Topic and VV Integration
2016-09-12 15:32:20 -04:00
Aurorablade
f1aada7ea1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-09-11 19:50:53 -04:00
Krausus
7ccedd41b4 Fixes automated ban notes having bad ckeys 2016-09-10 19:44:05 -04:00
Krausus
d146de1dd7 UID mass replace: src=\ref[datum] 2016-09-05 23:12:08 -04:00
Krausus
92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
Aurorablade
b551345b73 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-08-24 20:49:20 -04:00
Crazylemon64
88a3ba1406 Moves AI movement to their own procs, and cleans up their creation 2016-08-22 23:17:48 -07:00
Aurorablade
ec3d8c67a5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-08-19 01:01:19 -04:00
Kyep
22857fcab4 Adds Syndicate Infiltration Team (#4816)
* Adds Syndicate Infiltration Team

Goals:
- Provide a way to introduce a group of co-operating traitors, e.g: for
events.
- Provide a way to draw several ghosts into the round at once.
- Provide a way to enable additional objectives (e.g: kidnap) traitors
don't currently have a way to complete.
- Provide an evil counterpart to the Emergency Response Team.

Main:
- Creates a new "Send Infiltration Team" verb under Secrets -> IC for
admins. This verb creates a team of syndicate infiltrators, drawn from
ghosts.
- The infiltrators themselves are prespawned with stealth items
(including 20 TC uplink implants, dust implants, chameleon jumpsuit,
etc).
- The admin who invokes the SIT chooses their mission. It can be
anything.
- This team has their own shuttle, with 3 docking points on the
Cyberiad: arrivals maint, eng maint, and sci maint.
- Their shuttle has blast doors, and a small shuttle brig for abducting
Cyberiad crew.

Misc:
- Creates an 'emag_immune' attribute for doors (and pod doors). Applies
it to SST, SIT and nuke ops main doors. SST application prevents an
exploit. SIT/nukeops application prevents failzerg.

* check_rights, color codes

* Improved Options

- Added PDA painter to SIT spawn room, to prevent SIT members from
metagaming the SIT by identifying them from their PDA color.
- Added food, drinks, and laundry machine/crayons (to recolor gloves) to
the SIT spawn room.
- Added team size prompt for issuing admin, to allow them to send larger
or smaller teams.
- Removed storage implant from the list of things SIT team members spawn
with. In most cases, they will have plenty of TC to buy one if they want
it.
- Fixed action button sprite on dust implant. No longer displays as
blank.
- Added the number of TC each team member gets on spawn as an
admin-configurable option when using the verb. 20-30 is suggested.
- Updated memories ("Notes") given to each SIT member upon creation.
- Fixed a bug with SIT team size which was sometimes causing one less
person to spawn than was intended.

* Minor Improvements

- Made SIT members show up on antaghud, and to each other. Rather like
nuke ops.
- Made SIT members start out with a flashlight in their backpack, so
they can more easily find their way into the station from maint, without
bumbling around in the dark.
- Removed manhack grenade from SIT shuttle, replaced it with a welding
tool. Subtle hint to break the wall into the station.
- Added option for admins to spawn a Syndicate Officer to brief the team
before they go. The officer does not go with the team. They're rather
like ERT Directors briefing ERTs before they are sent out. Optional
fluff.

* Map Area Tweak

* Fixes potential SST exploit with c4-ing mech door

* Tiger

* World's smallest merge/Travis fix

* Renames Officer to Management Consultant

* Removes protected var blocking C4 on poddoors

* Removes emag_immune property for doors
2016-08-17 17:21:51 -04:00