Commit Graph

6501 Commits

Author SHA1 Message Date
Cheridan d68a9841d9 Merge pull request #4641 from Ikarrus/MapHero
[MAP]Boxstation Dynamic maintenance overhaul
2014-09-04 00:44:25 -05:00
Cheridan 7d26b6adae Merge pull request #4632 from optimumtact/orionfix
Prevent ghosts seeing admin flag warnings when they click on machines
2014-09-03 21:04:52 -05:00
Aranclanos aefa7a3795 Merge pull request #4660 from Miauw62/allgiasfault
fixes colors and name tags
2014-09-03 20:11:28 -03:00
Miauw 832b433df0 makes request consoles no longer say "title". Fixed #4652 2014-09-02 20:42:53 +02:00
Miauw f07c1acbc1 fixes colors and name tags 2014-09-02 20:02:37 +02:00
ikarrus bf5f5e5922 Resolved Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
2014-09-01 22:58:23 -06:00
Cheridan ed9ef3c3e3 Merge pull request #4583 from JStheguy/master
NT Poster Port
2014-09-01 17:49:44 -05:00
Miauw 2c9e5b69da Fixes a radio runtime. 2014-09-01 14:14:35 +02:00
Francis Devine a492b70f16 No visible message for observer topic check
This avoids the user seeing a message about lacking admin flags when
they try to use machinery as a ghost
2014-09-01 15:46:04 +12:00
Alex 837d5bc7eb Merge pull request #4456 from Ikarrus/table_prints
Fingerprints for Cables and Tables
2014-08-31 17:11:14 +01:00
Cheridan e25affe12e Merge pull request #4337 from Miauw62/say()
[READY] Saycode rewrite
2014-08-31 10:59:04 -05:00
Miauw dc5ba247b2 blblb 2014-08-31 15:10:32 +02:00
Miauw 6176d845f0 fixes some stuff gia told me to fix 2014-08-31 14:27:40 +02:00
Miauw 78a9b0be69 Merge branch 'master' of https://github.com/tgstation/-tg-station into say()
Conflicts:
	code/__HELPERS/game.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/requests_console.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/objects/items/devices/PDA/radio.dm
	code/game/objects/items/devices/aicard.dm
	code/modules/admin/admin_verbs.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/voice.dm
	code/modules/mob/living/carbon/brain/brain.dm
	code/modules/mob/living/carbon/human/whisper.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/say.dm
2014-08-31 13:40:16 +02:00
Alex c788df4d6e Merge pull request #4596 from Jordie0608/greenisthecolorofdiseaseandirish
[MAP] Fixes #3147 Greens Viro, fixes building glass med airlocks
2014-08-31 12:34:34 +01:00
Alex 2c19d113bd Merge pull request #4580 from Firecage/changelingpanaceatext
This fixes the description that Anatomic Panacea gives.
2014-08-31 12:34:01 +01:00
Alex ac4b0954f0 Merge pull request #4587 from Firecage/showerloggingprints
Shower logging and prints
2014-08-31 12:32:31 +01:00
Alex 0cb906cc62 Merge pull request #4606 from Ikarrus/detailedendreport
More Detailed End-Round Report
2014-08-31 12:29:43 +01:00
ikarrus df4125d2d6 Approval Rating will now only consider living carbon mobs with associated keys.... All those soulless monkeys and slimes don't count!!! 2014-08-31 02:18:02 -06:00
Alex ca731cfeda Merge pull request #4610 from Ikarrus/blobreporttweaks
Tweaks to Blob Mode Command Reports
2014-08-30 20:14:24 +01:00
ikarrus 61ec54850f Tweaks to Blob Mode Command Reports
-Classified report is now sent a few minutes after the blobs burst (Formerly 4 seconds)
-Classified blob reports now have the same name as admin-classified reports, so they can't just meta the contents based on the paper's name alone
2014-08-30 11:06:11 -06:00
ikarrus 5eed668e33 In the interest of keeping it clean and simple, only either survivors or escapees are reported. 2014-08-29 21:57:50 -06:00
ikarrus 674862e2b7 Formatting cult and rev stats the same way as the others I added 2014-08-29 21:29:26 -06:00
ikarrus 7dc89c0d10 More Detailed End-Round Report
End-Round report will now also declare some round statistics, including
-Round duration
-Station integrity
-Total population
-Survival Rate
-Evacuation Rate
-Command's Approval Rating (During rev only)

Bugfix:
-Ending the round as a brain will no longer report to the player that they have survived
2014-08-29 21:24:30 -06:00
Miauw 761d02577d minor change of wording 2014-08-28 22:19:58 +02:00
Joonatan O'Rourke 492a043f47 fixed reinforced tables
Fixes not being able to place wrenches on (unweakened) reinforced
tables. The return statement in the conditional for the wrench in
attackby was preventing control from reaching the conditional later on
that places the wrench on the table. The conditional for the wrench now
checks if it can destroy the table, and if not it continues down to
where it is then placed on the table. table_destroy is now guaranteed to
destroy the table. Also removed the now redundant check in table_destroy
and made it more portable between different kinds of tables. Also fixed
an obvious typo.
2014-08-28 20:02:55 +03:00
Jordie0608 4d14bd2dc6 Greens Viro, fixes building glass med airlocks 2014-08-28 23:00:21 +10:00
KyrahAbattoir 5a928fd7a1 Replaced all the static items in maintenance by random item spawns.
Replaced the numerous "copy paste" racks of meson/firesuit/gasmask piles with proper firefighting lockers.
2014-08-28 13:12:40 +02:00
Firecage f20c97b59e Updates to shower 2014-08-28 12:02:36 +02:00
Miauw 3e3b9c2778 Fixes a bug where AIs heard holopad messages twice. 2014-08-27 18:52:02 +02:00
Miauw 4580b42761 Removed my debug verb. 2014-08-27 18:31:31 +02:00
Miauw bc2b8d0d5d DONE DONE DONE DONE DONE DONE 2014-08-27 17:40:26 +02:00
Cheridan 96cf5cdedd Merge pull request #4574 from Ikarrus/commscooldown
Console Cooldown Tweaks
2014-08-27 10:16:00 -05:00
Firecage 465f23e184 The shower will now both log it and add hidden fingerprints when you wrench it to change the temperature. 2014-08-27 16:37:39 +02:00
JStheguy ae64c526ad Okay yeah some changes
Error posters link to /tg/ issues page now.
Also syndie revolvers have 7 shots so yeah change because facts
2014-08-27 07:14:43 -05:00
JStheguy 0dc184004c NT Poster Port
-Adds all them NTstation posters and the poster subtype system.
2014-08-26 19:03:03 -05:00
Firecage 53647721d1 Fix 2014-08-26 22:51:30 +02:00
Firecage dd9a084296 This fixes the description that Anatomic Panacea gives. 2014-08-26 22:36:58 +02:00
Cheridan 0198ec2bde Merge pull request #4576 from Firecage/SPANCLASSES
SPANCLASSES!!!!!
2014-08-26 15:05:12 -05:00
Swag McYolosteinen 93e5918abc Merge pull request #4381 from Ikarrus/burglaralarm
Burglar Alarm for Captain's Display Case
2014-08-26 19:36:04 +02:00
ikarrus fba2c5981f Fixed for loop in firereset() 2014-08-26 10:39:28 -06:00
ikarrus 9cd7234fbf -Reverted AI announcement cooldown change
-AI announcements are now minor announcements
2014-08-26 10:33:47 -06:00
Alex 2e28ae57cf Merge pull request #4469 from Ikarrus/calibrations
Calibrations for Teleporter
2014-08-26 14:19:28 +01:00
Alex c093f4ce01 Merge pull request #4564 from Ikarrus/crewmonitorzfix
Fixes issue where Crew Monitors can only detect suit sensors on z1
2014-08-26 14:15:32 +01:00
Firecage 6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02:00
Alex a64217bafb Merge pull request #4538 from Ikarrus/maroon
Maroon and Destroy objectives for Traitor and Changeling
2014-08-26 08:14:01 +01:00
Alex 7afdf6de30 Merge pull request #4553 from Ikarrus/ss13forever
Station Name Set in Config
2014-08-26 08:10:53 +01:00
ikarrus 98cf2559c3 Console Cooldown Tweaks
-Cooldown for sending messages to centcom reduced to a minute. Often times conversations between the messenger and centcom are cut short by the very long cooldown time.
-Cooldown for AI priority announcements increased to 5 minutes. The fear I had when I implemented it was AIs misusing it by announcing pointless things for what should be reserved for actual important things.
-Ferry move request cooldown increased to a minute. Stop spamming us admins please.
2014-08-25 21:12:00 -06:00
ikarrus ae91a76160 Removed disloyal cyborg list since traitor cyborgs aren't a thing any more. 2014-08-25 09:11:58 -06:00
ikarrus ad4ba1126a Runtime fix 2014-08-24 22:03:14 -06:00