720ffcc862
Merge pull request #11073 from RemieRichards/WireModernisation
...
RnD Machines + Pizza bombs now use Wire datums
2015-08-12 22:23:18 -05:00
9104fd7456
Merge pull request #11107 from Core0verload/bedfix
...
Fixes #11090
2015-08-12 19:43:28 -04:00
eedea4d281
Merge pull request #11018 from Core0verload/hammerspace
...
New traitor item: storage implant
2015-08-12 14:45:23 +01:00
04b8aa46e0
Merge pull request #11128 from RemieRichards/FixGangRotation
...
Gang tags no longer rotate based on the user's dir
2015-08-12 00:23:05 -05:00
9622676d1e
Merge pull request #11132 from Cheridan/too_much_fun
...
Astral Tiles 1.01 - Fun Removal
2015-08-12 06:20:54 +01:00
a959ed3727
Merge pull request #11120 from phil235/ThrowEmbedFix
...
Fixes item embedding not working.
2015-08-12 06:20:26 +01:00
dfb560b030
Merge pull request #11032 from KorPhaeron/memesword
...
Removes Multisword from Spellbook
2015-08-12 00:15:11 -05:00
1c5fa3be4a
Merge pull request #11143 from Aranclanos/chemruntime
...
Removes the burning object out of the burning list before qdel()ing, …
2015-08-11 20:58:46 -05:00
be2d146a3d
Merge pull request #11142 from SconesC/phlog
...
Phlogiston no longer ignites every tick
2015-08-11 20:30:17 -05:00
529bba5f34
Merge pull request #11095 from bgobandit/weallscreamforreagents
...
Ice cream and cones now contain proper reagents.
2015-08-11 20:13:41 -05:00
032df41b14
Merge pull request #11067 from bgobandit/themobcannotventcrawl
...
Mobs can no longer ventcrawl while buckled or handcuffed
2015-08-11 18:27:03 -05:00
3a5cde5988
Merge pull request #10901 from CosmicScientist/mobcostumes
...
Adds carp and Ian costumes
2015-08-11 18:16:49 -05:00
f80c92c5aa
Corrects number mistake
2015-08-10 17:13:05 -07:00
fcf3405c6b
Phlog nerf + negative firestack bug fix
2015-08-10 17:09:34 -07:00
3eb09817e4
Removes the burning object out of the burning list before qdel()ing, fixing some runtimes
2015-08-10 19:06:45 -03:00
1d20eb2ccf
Removes redundant variable.
2015-08-10 15:42:29 -04:00
fcbd841b60
Merge pull request #11138 from Miauw62/eckeck
...
Removes tape recorder wires to fix a server-crashing bug.
2015-08-10 13:03:10 +01:00
ad1da7c157
Removes tape recorder wires to fix a server-crashing bug.
2015-08-10 14:00:05 +02:00
2df4cdb7cd
Thank you Remie for catching this intentional error.
...
Removes amount = 30
2015-08-09 23:07:24 -05:00
e6fe8baa24
Astral Tiles 1.01 - Fun Removal
2015-08-09 23:02:32 -05:00
4313c9c343
Merge pull request #11089 from RemieRichards/ItemDropMouseOpacity
...
Fixes items keeping mouse opacity if their container is destroyed
2015-08-09 21:47:57 -05:00
83327ca40b
Gang tags no longer rotate based on the user's dir, this was fugly and the sprites were NOT designed to do this.
2015-08-10 02:14:15 +01:00
b7ca110654
Merge pull request #11096 from Incoming5643/chen_goes_fishing
...
Stepping on horns now invokes the proper experience
2015-08-09 18:49:35 -05:00
e922f510c5
Fixes not getting the hit message and sound (and logging) when the item embeds itself in a human.
...
Throwing a big item at an alien no longer pushes it.
If the item embeds itself in you, it doesn't push you.
Fixes an old argument in item/throw_impact() that I forgot to remove.
Rename the skip argument of hitby() to skipcatch (more explicit).
2015-08-09 20:30:47 +02:00
13b43cba87
Merge pull request #11100 from phil235/BrainrotFix
...
Fixes brainrot being incurable.
2015-08-09 10:45:54 -05:00
23a3ef7994
Fixes item embedding not working.
2015-08-09 15:57:36 +02:00
9c44303661
Merge pull request #11057 from Cheridan/merely_pretending
...
Adds Astral Carpet Tiles
2015-08-09 11:51:35 +02:00
346848b875
Merge pull request #11084 from bgobandit/goofbotany
...
Adds several new reagent reactions to hydroponics.
2015-08-09 02:46:38 -05:00
e7f95af201
Merge pull request #11092 from xxalpha/BOOOOOOOOOOOOM
...
Fixed inbuilt jetpacks dropping when suit is deleted.
2015-08-09 02:39:58 -05:00
63698004d6
Fixes Conflicts, Also Structural Code Stuff
2015-08-08 20:16:53 -05:00
d915997ea7
Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/11057
...
Conflicts:
icons/obj/items.dmi
2015-08-08 19:36:36 -05:00
70a8046081
Merge pull request #10815 from bgobandit/bagtags
...
Body bag sprites now update their tag overlay properly.
2015-08-09 02:18:56 +02:00
1f3440649a
fixes my shit
2015-08-08 19:49:09 -04:00
1f8a439fb2
Fixes bedsheet-capes sprites.
2015-08-09 01:42:36 +03:00
6a1324deb5
Merge pull request #11081 from phil235/AnnouncerRuntimeFix
...
Fixes runtime when spawning a sNPC
2015-08-08 10:49:29 -05:00
445e8c5657
Update miscellaneous.dm
...
Adds to the hardsuit description to tell of its melee incapability.
2015-08-08 16:01:39 +01:00
2844c80ed5
Fixing merge conflicts
2015-08-08 15:43:38 +01:00
e3400c0fc8
Fixes brainrot being incurable.
2015-08-08 11:42:44 +02:00
ed6b59c78e
Stepping on horns now invokes the proper experience. Now the clown can honk even if you disable its hands.
...
#NotDeadJustBusy
#ThisIsOverADecadeTooLate
2015-08-08 01:05:40 -04:00
4212eb0e61
Ice cream and cones now contain proper reagents.
2015-08-08 01:01:59 -04:00
008c70acea
Fixed inbuilt jetpacks dropping when suit is deleted.
2015-08-08 04:05:51 +01:00
8950ac851d
Condenses some code.
2015-08-08 01:49:27 +01:00
f256246711
Merge branch 'master' of https://github.com/tgstation/-tg-station into OironTrailAdditions
...
Conflicts:
code/game/machinery/computer/arcade.dm
2015-08-08 01:38:57 +01:00
9fb63dbec9
Fixes items that survive a storage container's destruction keeping the storage mouse_opacity
2015-08-07 23:02:28 +01:00
d065e78dab
Puts costumes in theatre clothing vendor machine, corgi costume gives corgi meat when put in washing machine.
2015-08-07 20:18:26 +01:00
7a613fc2b6
Adds several new reagent reactions to hydroponics.
2015-08-07 13:44:13 -04:00
0a65e62ce4
Merge branch 'master' of https://github.com/tgstation/-tg-station
2015-08-07 12:15:17 -04:00
d68e1a7b32
Fixes runtime when spawning a sNPC that is a head and the announcer proc can't find any mind.
...
Small simplification of emp_act and emag_act of the announcement_system.
2015-08-07 17:38:39 +02:00
bec7be024f
Fixes runtime when firer is null.
2015-08-07 15:54:21 +02:00
f4b41b99bf
Merge pull request #11016 from Core0verload/mmi
...
MMI ID lock removed
2015-08-07 19:38:27 +10:00
Cheridan
WJohn
Remie Richards
SconesC
Aranclanos
bgobandit
Miauw
Cheridan
phil235
phil235
c0
CosmicScientist
CosmicScientist
Incoming
xxalpha
Kevin Chen
Jordie