4e7c2cbb8e
Merge pull request #4623 from phil235/WaterLightFix
...
Fix low water light on hydrotray
2014-08-31 20:55:41 +01:00
f4c38c6b86
Fix low water light on hydrotray
...
one single space...
2014-08-31 21:53:26 +02:00
e0d171e7bf
Merge pull request #4483 from ChuckTheSheep/direct-intent
...
Direct intent clicking (redo)
2014-08-31 11:25:47 -05:00
837d5bc7eb
Merge pull request #4456 from Ikarrus/table_prints
...
Fingerprints for Cables and Tables
2014-08-31 17:11:14 +01:00
e25affe12e
Merge pull request #4337 from Miauw62/say()
...
[READY] Saycode rewrite
2014-08-31 10:59:04 -05:00
4ef3beb454
Testing
2014-08-31 14:25:32 +02:00
ba20a875a0
Should fix merge conflicts
2014-08-31 14:22:56 +02:00
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
660a76e2a8
Merge pull request #4611 from Ikarrus/reportgrammar
...
Minor grammar correction for Centcom report names
2014-08-31 12:36:58 +01:00
a931f00608
Merge pull request #4563 from Ikarrus/allspecies
...
Secret Button to set everyone's mutant race
2014-08-31 12:32:02 +01:00
15c6e99801
Merge pull request #4607 from Ikarrus/removelobbymeta
...
Only Admins can see Ready Players in Lobby
2014-08-31 12:29:16 +01:00
9a335b7855
Merge pull request #4549 from Ikarrus/tinyprickironicsmiley
...
Adds a couple of new hallucination effects :^)
2014-08-30 16:51:09 -05:00
f209d4ba52
Merge pull request #4601 from Ikarrus/removeholidaycheer
...
Holiday Events no longer fire false alarms
2014-08-30 16:41:23 -05:00
679e0bda52
Merge pull request #4524 from Ikarrus/eventsprompter
...
Trigger Events verb will now ask if the admin wants to announce to the crew
2014-08-30 20:12:46 +01:00
ed0305cf6b
Merge pull request #4589 from Menshin/wand_fix
...
Fix wands losing a charge even when no spell was actually cast
2014-08-30 20:03:03 +01:00
14b03b5db5
Merge pull request #4569 from quiltyquilty/hairs
...
organizes various hairstyles
2014-08-30 20:01:55 +01:00
2f65498aa7
Minor grammar correction for Centcom report names
2014-08-30 11:18:19 -06:00
6d79ac49d1
Only Admins can see Ready Players in Lobby
...
Removes a lot of potential metagaming by stopping players from counting or remembering who readied up during the lobby.
2014-08-29 21:49:44 -06:00
a49f4e77ae
Holiday events will stop failing False Alarm events.
2014-08-29 09:15:23 -06:00
98d567dde7
more say bugfixes
2014-08-29 14:40:51 +02:00
291f0f5716
Holiday Events no longer fire false alarms
...
Fixes #4597
Also fixes wierd identation
2014-08-28 23:05:14 -06:00
a8732d4219
One more holiday event to label
2014-08-28 22:58:57 -06:00
723f1c46b0
Matches the real messages a little better
2014-08-28 22:27:06 -06:00
1cfdde31f3
-Trigger Event is now its own panel
...
-The prompt to alert the crew now includes a cancel button
-Holiday Events are now marked more clearly in the menu
2014-08-28 22:08:14 -06:00
3c0afa4e0a
Fixes another holopad bug.
2014-08-28 13:34:54 +02:00
b344431648
enforces consistency
2014-08-27 18:08:08 -05:00
0739769acb
does what giacom told me to do
...
renames some hairs
adds a few more that snapwalk made
2014-08-27 17:46:47 -05:00
0f3b711629
Tidying presentation
2014-08-27 21:07:52 +02:00
bdca196312
Fix wands losing a charge even when no shot was actually fired ( #4588 ).
2014-08-27 19:54:46 +02:00
bc2b8d0d5d
DONE DONE DONE DONE DONE DONE
2014-08-27 17:40:26 +02:00
96cf5cdedd
Merge pull request #4574 from Ikarrus/commscooldown
...
Console Cooldown Tweaks
2014-08-27 10:16:00 -05:00
0198ec2bde
Merge pull request #4576 from Firecage/SPANCLASSES
...
SPANCLASSES!!!!!
2014-08-26 15:05:12 -05:00
93e5918abc
Merge pull request #4381 from Ikarrus/burglaralarm
...
Burglar Alarm for Captain's Display Case
2014-08-26 19:36:04 +02:00
828d1627a3
code optimization
2014-08-26 10:51:20 -06:00
6c7af5eb32
SPANCLASSES!!!!!
2014-08-26 09:52:13 +02:00
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
b575eb93bf
organizes various hairstyles
...
this organizes several of the 25 hairstyles goof added. additionally, it changes the names of Bun Head and Twin Buns to Bun Head 1 and Bun Head 2. the Ramona haircut (that i made, so it's ok :)) has been modified because it did not fully work in game, and its name has been changed to Pixie Cut to avoid the spvtw reference.
2014-08-25 06:51:41 -05:00
eac854ec97
Secret Button to set everyone's mutant race
...
Mostly as a way to reverse the consequence of an badmin's lapse of good judgement (There's no easy way to reverse the Halloween event button.). This can also be used for an assortment of badminning.
2014-08-24 15:52:53 -06:00
e3c0b2fa43
AHAHAHAHAHAHHAHAHAHAHASDHHADFHEUAHGUIHGDGIJDOINGEIOKILLTHEMALL
2014-08-24 20:35:49 +02:00
6e35d0cd7f
Merge pull request #4554 from Ikarrus/deathsquadnames
...
Deathsquad names will pull from the deathsquad name list
2014-08-24 13:08:45 +01:00
f061c0d9d3
Merge pull request #4418 from Ikarrus/minorannouncements
...
Minor Announcements
2014-08-24 13:06:31 +01:00
cec103fa21
Merge pull request #4454 from Ikarrus/plasteel
...
Ore Redemption Machine can now Smelt Plasteel
2014-08-24 13:05:12 +01:00
10cfc1d4bc
Merge pull request #4445 from Incoming5643/meetthemeat
...
Adds unique meat types for throwing mutant races in the gibber
2014-08-24 13:04:10 +01:00
80251c2bf2
Merge pull request #4529 from Firecage/ZombieIan
...
This fixes Zombified Ian
2014-08-24 13:01:54 +01:00
1cf20bb083
Merge pull request #4519 from Firecage/simpleanimalattacktextfix
...
Fix for simple animal attack text on humans.
2014-08-24 13:01:33 +01:00
944966ba93
Merge pull request #4520 from Firecage/Messagefixes
...
This fixes the message issues
2014-08-24 12:59:52 +01:00
be25e5b9e4
Merge pull request #4511 from Limeliz/char-setup
...
Scroll through hair styles and facial hair
2014-08-24 12:59:40 +01:00
860e905d32
Merge pull request #4539 from Firecage/Spanclasses
...
Spanclasses
2014-08-24 12:58:40 +01:00
cba3fa364f
Reducing dup code
2014-08-23 21:43:48 -06:00
5413812958
Deathsquad names will pull from the deathsquad name list
...
I didn't know they were a thing. But now they are, once again!
2014-08-23 21:41:49 -06:00
Alex
phil235
Cheridan
Tokiko1
Miauw
ikarrus
quiltyquilty
Menshin
Firecage