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
15c6e99801
Merge pull request #4607 from Ikarrus/removelobbymeta
...
Only Admins can see Ready Players in Lobby
2014-08-31 12:29:16 +01:00
f901a0e98a
Additional Tweaks
2014-08-31 01:50:16 -06:00
51a333ebe7
Merge gang mode into latest version
2014-08-30 23:31:44 -06:00
4c801434a8
Gang Mode
2014-08-30 23:17:14 -06:00
14b03b5db5
Merge pull request #4569 from quiltyquilty/hairs
...
organizes various hairstyles
2014-08-30 20:01:55 +01: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
49ec1919c7
facehuggers won't attack an infected person
2014-08-29 19:11:35 -07:00
2a7d7d522f
fixes aliens resting/crit sprites
2014-08-29 18:11:01 -07:00
98d567dde7
more say bugfixes
2014-08-29 14:40:51 +02:00
a23dbe2357
Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor
...
Conflicts:
code/game/objects/items/devices/radio/radio.dm
code/game/objects/items/toys.dm
code/game/objects/items/weapons/tanks/tank_types.dm
code/game/objects/items/weapons/tanks/tanks.dm
code/modules/events/ninja.dm
code/modules/power/cell.dm
code/modules/power/port_gen.dm
code/modules/reagents/reagent_dispenser.dm
2014-08-29 04:21:15 -07:00
7b110f6a30
Fixes skeletons unable to play xylophone on their ribcage ( #4594 )
2014-08-29 01:04:53 +02:00
51f1dcc4f5
fixed larva night vision
2014-08-28 14:14:05 -07:00
8b19b2bb38
cleanup
2014-08-28 11:50:02 -07:00
ea4350a0a1
Adds the magicarp event as a rare happening.
2014-08-28 12:10:48 -04:00
3c0afa4e0a
Fixes another holopad bug.
2014-08-28 13:34:54 +02:00
04d7d954d2
awful awful table smoothing pasta replaced with smoothwall modification
2014-08-27 17:16:49 -07: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
ca77a4e31d
more icons for stuff, nightvision for aliens with hud icon button and toggle verb
2014-08-27 15:16:28 -07:00
bc2b8d0d5d
DONE DONE DONE DONE DONE DONE
2014-08-27 17:40:26 +02: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
6c7af5eb32
SPANCLASSES!!!!!
2014-08-26 09:52:13 +02: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
e3c0b2fa43
AHAHAHAHAHAHHAHAHAHAHASDHHADFHEUAHGUIHGDGIJDOINGEIOKILLTHEMALL
2014-08-24 20:35:49 +02: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
f704c320d7
More saycode bugfixing, adds a saycode readme, etc.
2014-08-23 16:21:02 +02:00
e62e541860
Adds two new hairstyles, both variations of the himecut.
2014-08-23 11:47:41 +02:00
1a30c9c147
Merge pull request #4522 from ChuckTheSheep/Search-Fix
...
SearchFix - Fixes #4497
2014-08-22 20:02:27 +02:00
2602aeebc8
aliums 2spukki
2014-08-22 10:13:18 -07:00
add7871783
Nerfs to AI's HUDs
...
- AI Medical HUDs require that the person's suit sensors be enabled (any
active mode) in order to view status data.
- AI Security HUDs display only the person's job as given by their ID,
no security status or implant detection.
2014-08-22 09:03:39 -05:00
6eacb45fc5
This fixes Zombified Ian
2014-08-22 15:54:56 +02:00
81e178737d
Silicon Medical and Security HUDs!
...
- The AI can now access both Security and Medical HUDs via a new button
on its UI. The Medical HUD is exactly equal to all others. The AI's
Security HUD cannot detect implants.
- Cyborg HUD modules have been removed in favor of an inbuilt command,
to make it less of a hassle to access them.
- HUD code has been given its own file such that it can be used by any
mob. In addition, HUD users are placed into a list instead of searching
for only humans and checking them for a HUD item. This is to make it
easier to expand.
- Security HUD messages can now be received by any mob using a SecHUD.
2014-08-21 22:59:30 -05:00
747e35c1c8
SearchFix - Fixes #4497
2014-08-21 20:47:58 -04:00
7ac7ecb277
Summon Events Initial Commit: See the pull for complete details
2014-08-21 20:05:41 -04:00
4198e61af1
This fixes the message issues
2014-08-22 01:15:13 +02:00
d0fb8fcfc2
Fix for simple animal attack text on humans.
2014-08-22 00:34:52 +02:00
44383ec1c8
Disregard that I suck cocks
2014-08-21 07:35:51 -07:00
99913b926a
Merge pull request #4476 from Iamgoofball/hair
...
Adds 25 new hairstyles.
2014-08-21 09:47:42 +02:00
eff867c5f0
Merge pull request #4474 from Cheridan/slime_fix
...
Fixes infinite slime nutrition exploit
2014-08-20 19:35:46 +01:00
d0c97aae72
Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor
...
Conflicts:
code/ATMOSPHERICS/components/unary/vent_pump.dm
code/game/gamemodes/cult/ritual.dm
code/game/gamemodes/nuclear/pinpointer.dm
code/game/machinery/spaceheater.dm
code/game/machinery/status_display.dm
code/game/objects/effects/decals/crayon.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/items/weapons/airlock_painter.dm
code/game/objects/items/weapons/cigs_lighters.dm
code/game/objects/items/weapons/storage/secure.dm
code/game/objects/items/weapons/tanks/tank_types.dm
code/modules/assembly/assembly.dm
code/modules/assembly/holder.dm
code/modules/assembly/mousetrap.dm
code/modules/mob/living/carbon/alien/special/facehugger.dm
code/modules/mob/living/carbon/slime/examine.dm
code/modules/power/cable.dm
code/modules/reagents/grenade_launcher.dm
code/modules/reagents/reagent_containers/food/drinks.dm
code/modules/reagents/reagent_containers/food/snacks.dm
code/modules/reagents/reagent_containers/glass.dm
code/modules/recycling/sortingmachinery.dm
Thanks Firecage, this is all your fault
2014-08-20 05:54:20 -07:00
6fc3974228
fixes
2014-08-19 15:58:13 -07:00
013cf24842
we can now translate the hairstyle names without being a doritos munching mtn dew chugging 4chan pass owner
2014-08-19 15:43:05 -07:00
196f861efb
Merge pull request #4441 from Ikarrus/brigtimer_notice
...
Brig cells and Labor Shuttle will notify SecHUDs on release of a prisoner
2014-08-19 10:32:50 +01:00
c8bd6af8bf
Merge pull request #4480 from Incoming5643/statuefix
...
fixes #4479
2014-08-19 10:20:56 +01:00
5765a2e2cb
Resolves many, more saycode bugs. AI tracking is still broken.
2014-08-18 18:51:07 +02:00
Miauw
Alex
ikarrus
Hornygranny
MrPerson
Menshin
Incoming
quiltyquilty
Cheridan
Firecage
Tokiko1
GunHog
ChuckTheSheep
iamgoofball