Commit Graph

730 Commits

Author SHA1 Message Date
Razharas eb4d6c66a5 Merge branch 'master' of https://github.com/tgstation/-tg-station into VarEdit 2015-06-29 13:42:23 +03:00
MrStonedOne 9a64d1db9e Removes duplicate variable in adminhelp. 2015-06-27 16:49:39 -07:00
MrStonedOne d9da2290e8 Cleans up adminhelp keyword searcher and changelog for #10196. 2015-06-27 13:03:47 -07:00
Razharas 3d556ea970 Some varedit improvements
Fixed give spell window hiding most important part of the spell types
Added call proc to varedit so all things you can open in varedit you can
also call procs on
2015-06-27 18:00:57 +03:00
MrStonedOne 0aeffb3c0f Admin help tweaks.
The keyword scanner (thing that adds (?) links to player names in admin helps) has been moved to its own proc.
This has been added to all admin pms.
It has been added to asays as well, with the (FLW) link removed to avoid it being distracting.

Replying to an admin help (but not other forms of admin pms nor admin pm replies) by clicking on the name of the ahelper will now send a message to all admins letting them know you are typing up a reply to it. (this should avoid mutiple people replying to the same ahelp) (It also sends a message if you escape out of the ahelp reply as well)
2015-06-26 16:30:37 -07:00
Jordie0608 58399f7602 Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours
Conflicts:
	icons/obj/items.dmi
2015-06-24 20:31:51 +10:00
MrStonedOne 9583b1213b Adds new timer subsystem
Adminhelps now use it so that they can cancel the timer to return the admin help verb.
Adminhelps now allow admins to reject the adminhelp, giving the user back the verb and a message telling them how to construct a better admin help.
2015-06-21 11:55:38 -07:00
Jordie0608 25445e5a05 Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-06-20 17:32:16 +10:00
Jordie0608 0bf6f09969 Merge branch 'master' of https://github.com/tgstation/-tg-station into whocodesthecodemen
Conflicts:
	code/modules/admin/verbs/pray.dm
2015-06-16 17:24:20 +10:00
Jordie0608 34fb8cc8bc toggle nuke and set sec level button, flamethrower logging 2015-06-16 17:19:56 +10:00
phil235 ae8c69f9a7 Merge pull request #9955 from kingofkosmos/spanspaceremoval
Unnecessary space removal from spans and messages
2015-06-15 18:20:04 +02:00
Cheridan ec8cd61d4c Merge pull request #9808 from Incoming5643/march_of_the_snowflakes
WJohn's Hyper Customizable Lizard Sprites
2015-06-14 17:40:20 -05:00
Jordie0608 a67de221cc JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging 2015-06-14 23:37:35 +10:00
kingofkosmos c8d79e7034 Removed unnecessary spaces in these situations:
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03:00
Jordie0608 3e07dbc5a9 Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours
Conflicts:
	icons/obj/chemical.dmi
2015-06-13 20:23:29 +10:00
Razharas 486888f801 Merge pull request #9630 from AnturK/vv_assoc
Fixes varediting associative lists
2015-06-13 04:44:24 +03:00
Incoming 595bb0c8e4 Generalizes lizard parts to "features" for future non-lizard fields, at the same time merging mutant color into this list
Random lizard bodies will finally have color!

Pushes features almost all the way to the DNA side of thing, the mob side is only needed during character creation.

Note that changes to the save file will invoke a one time per character runtime for legacy characters as the save file purges mutant_color, this is as far as I can tell harmless, has no effect on the player, and is self correcting.
2015-06-12 00:43:35 -04:00
Remie Richards debb7da66b Merge pull request #9588 from AnturK/build_area
Adds map generators to build mode
2015-06-11 12:50:20 +01:00
Razharas 6f624b79df Merge pull request #9139 from Xhuis/pray_4_fun
Adds prayer sounds to admins + prioritizes chaplain prayers
2015-06-11 02:58:46 +03:00
Jordie0608 77b2e54de7 code improvement and overlays for fancy storage, dropper, syringe and lighter 2015-06-10 18:58:19 +10:00
Incoming bff351c555 Intergrates lizard parts into dna stuff so changelings can properly steal them.
Turns all the lizard options into one associated list instead of their own vars, for tidiness

Shuffles horns behind frills in terms of layering
2015-06-07 21:05:34 -04:00
Iamgoofball a9c25caef3 forgot the new admin debug verb 2015-06-06 18:50:14 -07:00
Iamgoofball 8aa79e1f1c fixes and changes 2015-06-06 18:40:38 -07:00
AnturK d43e8320b2 Adds area generators to build mode
Adds two generators : Asteroid and Syndicate
Syndicate templates
Finish syndicate templates
Moves border and repressurize to helpers.dm
Repressurize generator
Shuttle generator
Buildmode now resets the corners when switching modes/generators
2015-06-03 21:57:11 +02:00
Firecage f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02:00
AnturK c58142d394 Stability fix 2015-05-29 19:42:41 +02:00
Incoming 69f8f6575b Antagonists Will No Longer Show Up as MODE in round end reports.
Instances where the game would give special treatment to MODE players will instead check to see if a player's assigned_role (job) matches their special_role (antag status). All antags that start off station (as well as ninjas for some weird reason) were affected.

Fixes #8743
2015-05-25 15:58:32 -04:00
Remie Richards c5a2c5d396 Merge pull request #9572 from Aranclanos/stealthAdminPM
Fixes admin-PM on stealth
2015-05-25 18:28:32 +01:00
Cheridan 8cc916c52b Merge pull request #9618 from phil235/RuntimesMustDie
More runtimes fixed
2015-05-24 18:11:13 -05:00
AnturK 3b1a5fbdca Fixes some false positives 2015-05-24 15:11:50 +02:00
AnturK 2638a5d4e9 Fixes editing associative lists 2015-05-24 14:56:39 +02:00
phil235 f643769ef4 Fixes some runtimes with bluespace artillery, handcuffs on simple animals, lobby music start, stunbaton attack, kitchen bowl update_icon, particle accelerator admin log message, and plasmaman spec_life(). 2015-05-23 22:34:04 +02:00
Aranclanos 212e0c9c48 Fixes admin stealth failing to be actual stealth due to href reading or and the pop-out window.
Fixes #1121
Adds a new associative list, stealthminID, they will be associated with raw ckey text and their contents will be a random ID. The random ID is generated when an admin goes to stealth, without repeating itself.
New client procs that will handle the list, findStealthKey() and createStealthKey()
Admin-pms will use this special ID for admins who are stealthing, hiding their real ckey.
2015-05-20 09:26:26 -03:00
Carl Ivanov 2dc049b026 make hardset_dna to set blood type correctly
also hardset_dna sets species and mutant race color.
2015-05-20 19:15:08 +09:00
Xhuis aa52d59b18 Adds a Create Shadowling button 2015-05-10 22:07:19 -04:00
Remie Richards 7e0e50302a Merge pull request #9436 from MrStonedOne/powerfixes
Merges power subsystem into machine subsystem.
2015-05-10 08:23:20 +01:00
MrStonedOne c6c7237265 Merges power subsystem into machine subsystem.
This is to avoid issues from when they fire out of sync, since powernets assume machine's subsystem will fire directly after power's does.
2015-05-09 23:48:18 -07:00
phil235 1875f3a9c2 Merge pull request #9377 from Jordie0608/thebackpackistherealmagicitemhere
Group of fixes
2015-05-09 16:23:46 +02:00
Jordie a73ef787a2 Merge pull request #9380 from SconesC/spooky-faces
Replaces Plasmaman Gas Mask w/ Breath Mask
2015-05-09 22:03:34 +10:00
Remie Richards c77fefc937 Merge pull request #9374 from AnturK/abduction_third
Abduction fixes
2015-05-09 06:25:23 +01:00
Jordie0608 e72a4fb580 Drop-Everything deletes NODROP items 2015-05-08 18:40:23 +10:00
Cheridan 95d7af4e48 Merge pull request #9277 from Ikarrus/ertbaton
Batons for Light ERP
2015-05-06 09:03:55 -05:00
SconesC 20181c37b8 Replaces Plasmaman Gas Mask w/ Breath Mask 2015-05-05 17:55:32 -07:00
Cheridan 78e25c3175 Merge pull request #9220 from RemieRichards/PlasmaaaaaaaMeeeeeeen
Ports VG's Plasmamen + Species breathing additions
2015-05-04 00:19:18 -05:00
Ikarrus 040ffc9ace Grammar for special_role 2015-05-03 15:19:43 -06:00
Ikarrus 832e19a061 Fixed a bug with admins being told it failed to create a response team if they spawned a centcom official or deathsquad 2015-05-03 14:06:16 -06:00
AnturK 63b33f40cf Fixes button created teams not adding to gamemode 2015-05-03 15:15:09 +02:00
MrStonedOne eb7d5fefa5 Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious
Conflicts:
	code/controllers/subsystem/ticker.dm
2015-05-02 03:03:29 -07:00
Ikarrus b331391aa5 Batons for Light ERT
Moved the batons from the lockers to their backpacks so light ERTs can use them
2015-05-01 21:30:34 -06:00
Cheridan 0d1cfba3b7 Merge pull request #9200 from Ikarrus/ERTcodes
[Z2 MAP] Centcom Response Team Variations
2015-05-01 14:31:22 -05:00