Commit Graph

1228 Commits

Author SHA1 Message Date
Markolie
9cde629caf Fix station goals runtime and increase goal tenfold 2017-02-21 22:52:16 +01:00
Markolie
6982014a6e Replace all BYOND text macros 2017-02-21 15:41:37 +01: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
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
Mark van Alphen
dea264faf2 Merge branch 'master' into stationgoals 2017-02-17 18:05:15 +01: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
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
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
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
Markolie
62afefaf2c Further station goal fixes, fix communication computer messages 2017-01-24 22:07:12 +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
uraniummeltdown
02b5a096de windowflash proc, windowflash on notify_ghosts, pollcandidates, adminhelp and adminpm 2017-01-12 18:55:23 +04:00
Tigercat2000
4a6ae68fd2 Already forgot something ;) 2017-01-11 09:31:56 -08:00
Tigercat2000
0b69fe7842 Goonchat Twemoji support.
Add twemoji support to goonchat. It only parses annotations if the message has a
<span> tag with the 'emoji_enabled' class.

Also adds utf-8 support with goonchat, for the twemoji.
2017-01-11 09:31:56 -08: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
4a914c2a23 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2017-01-06 05:15:11 -08:00
Krausus
6bacdf5b0f Fixes SDQL2's client manipulation 2017-01-02 22:19:52 -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
Aurorablade
d9758cf31e Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub 2016-12-09 16:50:29 -05:00
Fox McCloud
d95a679273 Merge pull request #5938 from Kyep/sit_v3
SIT/ERT Runtime fix, misc fixes
2016-12-08 21:48:50 -05:00
Fox McCloud
287226fa19 Merge pull request #5858 from Markolie/grammarnazi
Verb category changes, telecoms verb fix
2016-12-07 12:33:36 -05:00
Kyep
945225b6e8 Runtime & bug fixes
- Fixes a runtime in preferences.dm created by the Patreon PRs,
triggered when an ERT, SIT, or any other clientless mob uses
"var/datum/preferences/A = new()".
- Fixes a bug where, if a SIT is spawned with the 'choose manually'
option, one fewer person than intended is pulled in.
- Fixes syndicate headset not being included in the SIT member's notes.
- Deletes commented code.
2016-12-03 06:24:47 -08:00
Aurorablade
fa1aa894ea Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-12-01 18:04:07 -05:00
Fox McCloud
55fc510c92 Merge pull request #5859 from Markolie/oocthrottle
[s]Adds OOC throttling
2016-11-24 07:46:35 -05:00
Aurorablade
0c637cebfa Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub 2016-11-22 01:48:56 -05:00
Fox-McCloud
9ace0245cf Removes Event Procs 2016-11-16 07:14:08 -05:00
Markolie
75176722e7 Add OOC throttling 2016-11-08 17:01:44 +01:00
Markolie
cff0528673 Verb category changes, telecoms verb fix 2016-11-08 16:23:13 +01:00
Aurorablade
23e392f0ef Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-31 22:38:14 -04:00
Fox McCloud
911fa70e1a Merge pull request #5601 from Crazylemon64/status_effect_overhaul
Ports over the status effect unification from the extreme refactor
2016-10-30 22:40:24 -04:00
Markolie
e9dc5b1b1f Fix secure briefcases appearing empty 2016-10-27 14:56:58 +02:00
Aurorablade
0a265f963c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-24 22:30:16 -04:00
Markolie
f61cfb47b9 Part three: The Hierophant. Also minor fixes for the other bosses. 2016-10-24 21:39:40 +02:00
Crazylemon64
6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07: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
Markolie
1a307cd8c9 Identity theft objective set fix, tank examine fix, proccall null return fix 2016-10-21 17:51:38 +02:00
Aurorablade
e2ce799aa1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-08 22:21:48 -04:00
Krausus
f010e142ce Fixes selecting datums through SDQL2 2016-09-26 04:54:34 -04:00
Fox McCloud
86afa72148 Merge pull request #5647 from Krausus/mentorchat
Changes Mod Say Into an Admin-to-Mentor Message Verb
2016-09-14 20:44:46 -04:00