Commit Graph

5687 Commits

Author SHA1 Message Date
Swag McYolosteinen 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
phil235 bf7dadc538 Merge pull request #11175 from Memendia/master
Grammar Fix
2015-08-14 12:25:57 +02:00
Swag McYolosteinen 46b519309e Merge pull request #11058 from Core0verload/surgery-organs-part2
Surgery & Organs rework: Phase 2
2015-08-13 18:04:16 +02:00
Swag McYolosteinen 5e18380888 Merge pull request #11103 from AnturK/latespawn
Adds admin verb to reset latejoin spawns
2015-08-13 16:38:11 +02:00
Swag McYolosteinen 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
Swag McYolosteinen 2bb4f63023 Merge pull request #11087 from phil235/GirderSinguloPull
Girder deconstruction bugfix
2015-08-13 16:33:28 +02:00
Memendia 6b649e583b Grammar Fix 2015-08-12 21:09:39 -07:00
Cheridan 720ffcc862 Merge pull request #11073 from RemieRichards/WireModernisation
RnD Machines + Pizza bombs now use Wire datums
2015-08-12 22:23:18 -05:00
WJohn 9104fd7456 Merge pull request #11107 from Core0verload/bedfix
Fixes #11090
2015-08-12 19:43:28 -04:00
c0 a06271733e Fixes and changes 2015-08-12 20:31:35 +03:00
Remie Richards eedea4d281 Merge pull request #11018 from Core0verload/hammerspace
New traitor item: storage implant
2015-08-12 14:45:23 +01:00
Cheridan 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
Remie Richards 9622676d1e Merge pull request #11132 from Cheridan/too_much_fun
Astral Tiles 1.01 - Fun Removal
2015-08-12 06:20:54 +01:00
Remie Richards a959ed3727 Merge pull request #11120 from phil235/ThrowEmbedFix
Fixes item embedding not working.
2015-08-12 06:20:26 +01:00
Cheridan 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
Cheridan 3a5cde5988 Merge pull request #10901 from CosmicScientist/mobcostumes
Adds carp and Ian costumes
2015-08-11 18:16:49 -05:00
Aranclanos 3eb09817e4 Removes the burning object out of the burning list before qdel()ing, fixing some runtimes 2015-08-10 19:06:45 -03:00
Remie Richards 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
Miauw ad1da7c157 Removes tape recorder wires to fix a server-crashing bug. 2015-08-10 14:00:05 +02:00
Cheridan 2df4cdb7cd Thank you Remie for catching this intentional error.
Removes amount = 30
2015-08-09 23:07:24 -05:00
Cheridan e6fe8baa24 Astral Tiles 1.01 - Fun Removal 2015-08-09 23:02:32 -05:00
Cheridan 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
Remie Richards 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
Cheridan 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
phil235 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
c0 73b4e8f5a6 Fixes #11110 2015-08-09 15:22:25 +03:00
Cheridan 63698004d6 Fixes Conflicts, Also Structural Code Stuff 2015-08-08 20:16:53 -05:00
Cheridan 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
phil235 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
bgobandit 1f3440649a fixes my shit 2015-08-08 19:49:09 -04:00
c0 1f8a439fb2 Fixes bedsheet-capes sprites. 2015-08-09 01:42:36 +03:00
c0 2e5cedef74 Added alien organs 2015-08-09 01:12:32 +03:00
AnturK 8a1e4435b6 Adds admin verb to reset latejoin spawns 2015-08-08 18:52:57 +02:00
CosmicScientist 2844c80ed5 Fixing merge conflicts 2015-08-08 15:43:38 +01:00
Jim Boonie 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
Incoming 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
Remie Richards 9fb63dbec9 Fixes items that survive a storage container's destruction keeping the storage mouse_opacity 2015-08-07 23:02:28 +01:00
phil235 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
Jim Boonie 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
Jordie 63c545346d Merge pull request #10992 from RemieRichards/AlternateWornLayer
Adds alternate_worn_layer
2015-08-07 19:37:52 +10:00
Jordie 9aa0fcf55f Merge pull request #11015 from Core0verload/bedsheets
Better sprites for bed and bedsheets
2015-08-07 19:36:15 +10:00
Remie Richards 4870122858 Rnd machines and Pizza boxes now use real wire datums, instead of the ancient method of list+var, Because of this they now also respond to Multitool-Pulsing.
Adds GetColour(index) helper to wire datums.
2015-08-07 03:35:10 +01:00
PatchouliKnowledge d80ecd8c74 Fixes syndie poison kits not being able to hold what they come with 2015-08-07 02:44:46 +03:00
c0 f57fe6785c A fix 2015-08-07 01:06:56 +03:00
c0 691f6fb66d Surgery & Organs Rework: Phase 2 2015-08-06 09:56:54 +03:00
Cheridan eb210ab6e8 Adds Astral Carpet Tiles 2015-08-05 23:46:49 -05:00
Remie Richards bcc55795f6 Merge pull request #10973 from MrPerson/automatic_stackomatic
Automatic stack merging
2015-08-06 02:33:45 +01:00
phil235 cdb8a5731b Merge pull request #11042 from Core0verload/fixedmyshit
Fixes implants not showing on HUD
2015-08-05 22:42:42 +02:00
c0 1e96bf29af Fixed implants on HUD 2015-08-05 23:09:07 +03:00
phil235 4e5be438cd Merge pull request #10990 from RemieRichards/StorageUnequipUsability
Storage Item Click Usability Improvement
2015-08-05 00:07:01 +02:00