204fdb8b2f
Update to biogenerator stuff PR
2015-01-16 09:24:39 +02:00
c1368f6816
Fixes what Miauw said with the secbelt thing.
2015-01-11 21:31:21 +02:00
2e20b8ea91
Biogenerator stuff.
2015-01-11 16:53:41 +02:00
404cd883f7
Merge pull request #6705 from Steelpoint/EmergencyResponseTeam
...
[FEATURE] Emergency Response Team
2015-01-10 10:10:59 +01:00
179003b57c
Merge pull request #6808 from Boggart/readminbugfix
...
Re-admin bugfixes.
2015-01-10 01:29:01 -03:00
1f91ac52a3
Merge pull request #6894 from Miauw62/ayythelmaoening
...
Emagged borgs will now properly unreference their MMI.
2015-01-10 01:16:01 -03:00
e79f4fc0c8
Merge pull request #6889 from Jordie0608/breakingtherelativebottle
...
Refactors glass bottle reagent spawning
2015-01-10 01:09:48 -03:00
8b32186300
Merge pull request #6903 from paprka/varpleasego
...
Removes an unused var
2015-01-10 01:01:43 -03:00
4291df8918
Merge pull request #6887 from Incoming5643/MyLittleSlimeCannotBeThisCute
...
Allows player slimes to use the slime faces that npc slimes can uses
2015-01-09 18:00:47 -03:00
40e5476a53
Merge pull request #6598 from Incoming5643/InstantSummons
...
Magic Mania 1.81: Instant summons!
2015-01-09 03:29:15 -03:00
ccdf83b8af
QuickTidyUp
2015-01-09 11:28:55 +08:00
34589f52bf
Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
...
Conflicts:
code/modules/projectiles/guns/energy/nuclear.dm
icons/obj/gun.dmi
2015-01-09 11:02:50 +08:00
69280f6b9b
Merge pull request #6879 from dannno/bandolier
...
Adds shotgun bandoliers
2015-01-08 22:47:09 -03:00
f0c07a647d
Merge pull request #6877 from Justin1693/master
...
Prevents "AI Holopad Request" Spam
2015-01-08 22:16:39 -03:00
f57d40d9e7
Merge pull request #6870 from Carn/fix_6862_6835
...
Resolves #6862 and #6835
2015-01-08 18:59:26 -06:00
071c02b583
removes an unused var
2015-01-08 16:58:33 -08:00
56bad0f7ce
Merge pull request #6747 from paprka/gunchangesv2baby
...
Further changes to the ranged stun system
2015-01-08 16:09:37 -08:00
a477b1f012
Merge pull request #6809 from paprka/floordirtnerf
...
Nerfs floor dirtyness
2015-01-08 14:25:23 -08:00
819add5c0c
*merges the slime face emotes into the generic emote list so there's no new VERB
...
*makes a changelog so no one misses out on this important news
2015-01-08 17:12:14 -05:00
9a63e64faf
adds a prob for a tile's dirt var increasing
2015-01-08 12:42:20 -08:00
731a9c03e5
>greentext commit messages
2015-01-08 20:42:05 +01:00
567755d798
Merge pull request #6836 from Boggart/holosignfix
...
Fixes the holosign projector making signs when put into storage. (can_be_placed_into refactor)
2015-01-08 16:04:49 -03:00
851f3e09b3
when i say copypasted, i mean it.
2015-01-08 20:00:47 +01:00
ab6d6a9b70
Prevents this bug from turning into a hydra.
2015-01-08 19:56:44 +01:00
109b0a434a
Fixed #3251 , emagged borgs will now properly unreference their MMI.
2015-01-08 19:49:48 +01:00
d7b56c9d7e
Nanites!
2015-01-08 20:13:06 +08:00
c6bd18c0f7
Refactors glass bottle reagent spawning, removes vestigial vars, bottles and robot bottles
2015-01-08 22:12:01 +11:00
27857ae90d
Allows player slimes to use the slime faces that npc slimes can uses.
...
Fixes #6882
Priority: Critical
2015-01-08 04:47:35 -05:00
cdc01c68df
remove unnecessary shiet
2015-01-07 23:23:34 -05:00
e4f42a2aef
Merge pull request #6750 from phil235/VisibleMessageFixing
...
Fixes visible_messages.
2015-01-07 20:06:21 -06:00
c76072608a
bamboliers
2015-01-07 20:28:16 -05:00
a2ea238b0c
Merge pull request #6639 from paprka/posfixes
...
Fixes some window sizes
2015-01-07 21:07:43 -03:00
87af9dcac4
fixes conflict
...
adds caching for ultimum optimizmisms
2015-01-07 17:06:39 -06:00
686cf88ce6
Changed method used for range checking
...
Now using Adjacent() instead of get_dist()
2015-01-07 14:31:37 -08:00
a7669b0270
Merge pull request #6816 from joonoro/master
...
Fixes syringe bug from #6372
2015-01-07 19:23:13 -03:00
2ba0cbbc7a
Merge branch 'master' of https://github.com/tgstation/-tg-station into posfixes
...
Conflicts:
code/modules/mob/dead/observer/observer.dm
2015-01-07 14:15:02 -08:00
35d9e03b92
Merge pull request #6849 from phil235/Statuefix2
...
Fixing a few things in statue's attackby
2015-01-07 18:53:53 -03:00
d0cab9da38
Prevents Another "AI Holopad Request" Spam Method
...
Fixes an easy way to spam holopad requests from multiple holopads all at
once.
2015-01-07 13:53:15 -08:00
c6e90c2ded
Resolves #6862 - "shuttle_away" docking port was too small to fit the supply shuttle into, so it could never return to centcom.
...
Resolves #6835 - Same issue as part of #6862 . Was adding new requests to the wrong list, so when reviewing the most recent request, the computer would not find it in the pending requests list and spit out the invalid instruction message.
2015-01-07 18:28:55 +00:00
b0fe1d9818
Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
...
Conflicts:
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2015-01-08 02:09:02 +08:00
4df0c62695
Merge pull request #6865 from paprka/revert-5646-newhosjumpsuit
...
Revert "Adds Nien's HoS formal sprites so they dont look like a Prince s...
2015-01-07 18:36:46 +01:00
e326cbab26
Merge pull request #6797 from sawu-tg/freshfood
...
Adds the new "E.X.P.E.R.I-MENTOR" research machine.
2015-01-07 09:31:31 -08:00
247f60c290
Merge pull request #6866 from Carn/fix_6864
...
Resolves #6864 - Sets ticker can_fire=1 inside the start_now verb.
2015-01-07 14:28:48 -03:00
75335fcd08
Fixes missing Category
2015-01-08 04:21:17 +11:00
4bcc5ec791
Resolves #6864 - Sets ticker can_fire=1 inside the start_now verb.
2015-01-07 17:13:23 +00:00
88e124e88c
Revert "Adds Nien's HoS formal sprites so they dont look like a Prince suit."
2015-01-07 09:12:39 -08:00
699439cc31
Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
...
Conflicts:
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2015-01-08 01:12:29 +08:00
feb141ca15
Merge branch 'master' of https://github.com/tgstation/-tg-station into freshfood
...
Conflicts:
code/modules/research/designs/machine_designs.dm
2015-01-08 03:58:31 +11:00
2a71a8ee12
Merge branch 'master' of https://github.com/tgstation/-tg-station into newhosjumpsuit
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/security.dm
code/modules/clothing/under/jobs/security.dm
code/modules/clothing/under/miscellaneous.dm
code/modules/clothing/under/ties.dm
icons/mob/head.dmi
icons/mob/uniform.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/uniforms.dmi
2015-01-07 14:59:24 +01:00
25e434e9a1
improved syringe fix readability
2015-01-07 12:49:54 +02:00
Firecage