6b091e0cb6
Merge pull request #11086 from freerealestate/rcdrebalance
...
Rebalances RCD construction costs around metal construction menu costs
2015-08-14 15:14:25 +02:00
bf7dadc538
Merge pull request #11175 from Memendia/master
...
Grammar Fix
2015-08-14 12:25:57 +02:00
46b519309e
Merge pull request #11058 from Core0verload/surgery-organs-part2
...
Surgery & Organs rework: Phase 2
2015-08-13 18:04:16 +02:00
5e18380888
Merge pull request #11103 from AnturK/latespawn
...
Adds admin verb to reset latejoin spawns
2015-08-13 16:38:11 +02:00
1142403f32
Merge pull request #11070 from PatchouliKnowledge/awkwardpoisons
...
Fixes syndie poison kits not being able to hold what they come with
2015-08-13 16:33:54 +02:00
2bb4f63023
Merge pull request #11087 from phil235/GirderSinguloPull
...
Girder deconstruction bugfix
2015-08-13 16:33:28 +02:00
6b649e583b
Grammar Fix
2015-08-12 21:09:39 -07:00
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
a06271733e
Fixes and changes
2015-08-12 20:31:35 +03: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
3a5cde5988
Merge pull request #10901 from CosmicScientist/mobcostumes
...
Adds carp and Ian costumes
2015-08-11 18:16:49 -05: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
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
73b4e8f5a6
Fixes #11110
2015-08-09 15:22:25 +03: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
2e5cedef74
Added alien organs
2015-08-09 01:12:32 +03:00
8a1e4435b6
Adds admin verb to reset latejoin spawns
2015-08-08 18:52:57 +02:00
6a1324deb5
Merge pull request #11081 from phil235/AnnouncerRuntimeFix
...
Fixes runtime when spawning a sNPC
2015-08-08 10:49:29 -05:00
2844c80ed5
Fixing merge conflicts
2015-08-08 15:43:38 +01:00
a7b09a84ab
- Made costs and delays variables
...
- Made plasteel multiplier a variable
- Made shocked grilles shock unprotected RCD users
- Made grilles deconstruct instantly to match wirecutters
- Made RCD unable to deconstruct reinforced floors
- Changed canRwall to canRturf to cover both r walls and floors
- Changed large matter cartridge matter amount to 160 so it can still fit in the RCD
- Added fourth matter cartridge to RCD crate so it once again holds enough cartridges to fully load it
2015-08-08 21:18:45 +12: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
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
866cdbcd34
Fixes plasma cutter firing sound, as well as lack of sound when slicing girder/statues.
...
Rearrange girders.dm
Singularity_pull() no longer unanchors anchored objects (because it breaks the deconstruction of table/girder/states/etc, and make mech pullable by mobs), but it still pulls them.
2015-08-07 23:14:45 +02: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
ebea552319
- Rebalances RCD construction costs around metal construction menu cost values
...
- Makes matter cartridges worth twice as much matter as metal/glass sheets
2015-08-08 06:15:35 +12: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
63c545346d
Merge pull request #10992 from RemieRichards/AlternateWornLayer
...
Adds alternate_worn_layer
2015-08-07 19:37:52 +10:00
9aa0fcf55f
Merge pull request #11015 from Core0verload/bedsheets
...
Better sprites for bed and bedsheets
2015-08-07 19:36:15 +10:00
21ea1ee740
Merge pull request #11020 from francinum/patch-2
...
Fixes the Orion Trail board Name.
2015-08-07 19:33:59 +10:00
032f1781a1
Merge pull request #11055 from Ikarrus/DOMINATING
...
Gang Dominator Tweaks
2015-08-07 19:32:51 +10:00
0287f37405
Merge pull request #11049 from phil235/RunningOnYourBulletsFix
...
Fixes being able to run into your own bullet
2015-08-07 19:32:06 +10:00
Swag McYolosteinen