Commit Graph

1807 Commits

Author SHA1 Message Date
Eearslya 85c3e22873 Polaris sync 2016-08-06 20:34:44 -07:00
SinTwo a17d42a84c mode name and ert sechud fix 2016-08-05 16:27:07 -04:00
Anewbe 2978f5093b Creates a prompt on unparalyze 2016-07-10 20:58:08 -05:00
Jon 88debefe3e The Beruang can now sent to visit the station once per round, with traders gathered, in the same manner as the admin ERT call! 2016-07-08 16:07:34 +01:00
Arokha Sieyes 71d29b0320 Added features, cancel buttons.
Added job selection, adding to manifest optionally by early-check if they were on it before.
2016-07-05 12:04:38 -04:00
Arokha Sieyes 34c6ba4604 Modernizes [Re]Spawn Character 2016-07-05 02:40:01 -04:00
Arokha Sieyes 484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris
# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm
2016-07-03 16:21:21 -04:00
Yoshax 38200a3e20 Introduces max record length for record, converts uses of max book length to max paper length barring books 2016-06-27 16:26:31 +01:00
Neerti 4f7641b1b8 Adds the following;
Control-click to copy object type to adv. buildmode
Ability to instantly build a rectanglar room with custom walls and floor by clicking two points.
Ability to create two ladders, linked to each other, and have correct icons, by clicking two points.
Ability to instantly move one object into another object by left/right clicking.
Ability to make anything glow, with custom range, intensity, or color, or to reset glowing.
Partial pathnames for all buildmode path inputs.
Adds spans.
2016-06-24 23:16:33 -04:00
Spades c89752a369 Fax, Prayer, and Emergency Comms
Resolves #1862
2016-06-14 16:32:13 -04:00
Arokha Sieyes 54272da167 Merge pull request #245 from VOREStation/sink
Synchronize With Polaris
2016-05-31 01:35:04 -04:00
Leshana 41afe2434a Fixed unmatched closing span tags. 2016-05-30 01:41:10 -04:00
Spades c96e66a144 Minor tweaks, Skipjack can now dock at station
Tried editing communicator.dm and shuttle_controller.dm as their own _vr
files but this might cause problems, I'm not sure.
2016-05-29 18:04:46 -04:00
Leshana e004a8bfc0 Merge remote-tracking branch 'polaris/master' into sink
# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme
2016-05-29 16:22:07 -04:00
Jon 21f898e047 First commit of manual port of BS12
#13042
and
#13086
2016-05-29 00:56:11 +01:00
EmperorJon 01b3182004 Merge pull request #1462 from Datraen/Xenobiology_2
Xenobio2
2016-05-28 21:32:18 +01:00
Leshana 9f699257de Organize and Beautify Admin Secrets Panel
* Add browser styles to Admin Secrets panel to make it look nice.
* Show only one category at once, with buttons to switch between categories at the top.
2016-05-27 16:32:46 -04:00
Leshana 396a094fb1 Organize and Beautify Admin Secrets Panel
* Add browser styles to Admin Secrets panel to make it look nice.
* Show only one category at once, with buttons to switch between categories at the top.
2016-05-27 16:29:04 -04:00
Arokha Sieyes 76567bb7a2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
# Conflicts:
#	code/modules/mob/living/carbon/human/whisper.dm

Whisper modified locally, and deleted upstream (in a change I made, so I know it's safe to remove).
2016-05-26 09:59:18 -04:00
Datraen 4448a6f469 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3
# Conflicts:
#	code/modules/mob/living/say.dm
2016-05-26 08:20:41 -04:00
Yoshax 77ee2215e7 Removes unused and unnecessary spam prevention 2016-05-26 04:24:18 +01:00
Datraen 349251e55f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3
# Conflicts:
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/obj/weapons.dmi
2016-05-25 15:09:23 -04:00
Datraen 9e09720be5 Final Initial Implementation of Xenobio2 System.
Kinks worked out, everything is functioning as it should.
2016-05-25 14:11:37 -04:00
Yoshax eaee6b7af9 Ensures special role returns true non-gamemode antags 2016-05-24 02:04:08 +01:00
Leshana e86d0a0ccb Added Change CKey Admin Verb
In order to let a broader range of admins set the ckey of mobs without
breaking things, this verb allows setting the ckey of mobs only to
currently-online players.
2016-05-20 20:43:36 -04:00
Datraen beda3185eb Reverts the second mob clean up because of incomplete implementation.
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
Kelenius 98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
PsiOmegaDelta a3f8bc815e Round start timer now remains at 0 until the round actually starts. 2016-04-20 15:27:59 +01:00
Atlantis e8a4f57bcf Adds full atmospherics reset admin verb
- Adds "Fix Atmospheric Problems" verb, that is accessible to server admins.
- This verb will perform full reset of atmosphere. Unlike reboot-zas this fixes any possible griefs or bugs, by completely purging all existing gases and resetting them to roundstart values.
2016-04-10 17:23:43 +01:00
EmperorJon 66b731783f Merge pull request #1386 from Datraen/BetterStealthmin
Changes mob names of admins that stealth while in lobby.
2016-04-09 18:35:55 +01:00
EmperorJon 00f4ca2cab Merge pull request #1367 from Neerti/4/5/2016_ambition_tweaks_2
Ambition system tweaks
2016-04-08 22:52:48 +01:00
Neerti d6b58cfe8d Ambition system tweaks
Ports Bay's port of this.  Did it manually because of ugly merge conflicts.
What Psi did:
Admins can now see and set ambitions in antag panel.
Makes is_special_character() a bit better.
What I did:
Setting ambitions, with the verb or with admin powers, is now logged.
Round-end text changed to be blue instead of bolded, for better readability.
Makes the ambition system known to the antag at the bottom of the chat log instead of before the 'you are a X' prompt.
2016-04-06 06:27:32 -04:00
Datraen e1c0256477 Brings the jumpsuits, pants, shorts, ponchos and hoodies under the path system. 2016-04-05 14:44:31 -04:00
Datraen 2e0fdafc37 Changes mob names of admins that stealth while in lobby. 2016-04-01 16:57:24 -04:00
Datraen 91a6c51ed2 Adds toggle verbs and procs. 2016-03-31 16:42:13 -04:00
Datraen 41996815ae Gives categorization to the preferences as per the current staff structure. 2016-03-31 16:30:13 -04:00
Yoshax db1a5021bc Corrects error in a span ckass 2016-03-28 17:19:03 +01:00
Yoshax d0d3d3cb16 Merge remote-tracking branch 'upstream/master' into morepreferences 2016-03-27 00:17:24 +00:00
Kelenius df5a0d7941 Mob inventory cleanup
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
Kelenius e883863f4b Merge branch 'master' into playingWithTravis 2016-03-23 17:12:11 +03:00
Yoshax 5d9596a72d Makes it possible to have more than 16 preferences 2016-03-21 18:56:27 +00:00
Datraen 996ce92f7f Merge pull request #1184 from Yoshax/510prep
Ports Byond 510 preperations from Bay
2016-03-20 13:45:40 -04:00
Datraen fe9d3fd4c4 Merge pull request #1027 from Kelenius/mobCleanup
Changes types of ghosts and eyes
2016-03-18 13:50:47 -04:00
Yoshax 9f4ff63d11 Makes being muted from something more visible 2016-03-16 20:29:18 +00:00
Yoshax 8be10d96dd Ports Byond 510 preperations from Bay
Updates comment

Updates supply file
2016-03-14 18:21:44 +00:00
Kelenius 1cd71da6ed Fixes one stay missed line 2016-03-11 12:02:01 +03:00
Kelenius 3fdda5e8c5 Fixes issues travis found 2016-03-11 11:59:51 +03:00
Kelenius 974a2a8216 Removes splash code
Unused
2016-03-10 10:55:35 +03:00
Neerti b4b8d94723 Merge pull request #1015 from Zuhayr/xenosremove
Removes xenormorphs.
2016-03-04 12:34:13 -05:00
Neerti 6224e978a9 Merge pull request #1014 from Zuhayr/voxremove
Removed the Vox Pox.
2016-03-04 12:32:23 -05:00