Commit Graph

18575 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
phil235 531334087e Merge pull request #11181 from Miauw62/sch-e-slch-schsch-schshc-sc-hschsch-schs-hcshchschschschschshcshshch-schsh-cshcsh-chschsch-s-chschscsh-cshcshcsh
Fixes ranged stuns causing slurring.
2015-08-14 11:15:41 +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 10a3f10f0f Merge pull request #11139 from RemieRichards/Varsception
VV and VV Mass Modify now accept variables when editing a string
2015-08-13 16:35:53 +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
Miauw 771bf84cc1 Fixes ranged stuns causing slurring instead of stuttering. Fixes #8189 2015-08-13 12:49:18 +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 dfb560b030 Merge pull request #11032 from KorPhaeron/memesword
Removes Multisword from Spellbook
2015-08-12 00:15:11 -05: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 be2d146a3d Merge pull request #11142 from SconesC/phlog
Phlogiston no longer ignites every tick
2015-08-11 20:30:17 -05:00
Cheridan 529bba5f34 Merge pull request #11095 from bgobandit/weallscreamforreagents
Ice cream and cones now contain proper reagents.
2015-08-11 20:13:41 -05:00
Cheridan 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
Cheridan 3a5cde5988 Merge pull request #10901 from CosmicScientist/mobcostumes
Adds carp and Ian costumes
2015-08-11 18:16:49 -05:00
Remie Richards 9ca1f2f262 VV and VV Mass Modify now accept variables when editing a string variable, this allows you to embed variables in string variables, variableception. 2015-08-11 04:52:48 +01:00
SconesC f80c92c5aa Corrects number mistake 2015-08-10 17:13:05 -07:00
SconesC fcf3405c6b Phlog nerf + negative firestack bug fix 2015-08-10 17:09:34 -07: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
bgobandit 1d20eb2ccf Removes redundant variable. 2015-08-10 15:42:29 -04: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
Cheridan 13b43cba87 Merge pull request #11100 from phil235/BrainrotFix
Fixes brainrot being incurable.
2015-08-09 10:45:54 -05:00
phil235 23a3ef7994 Fixes item embedding not working. 2015-08-09 15:57:36 +02:00
c0 73b4e8f5a6 Fixes #11110 2015-08-09 15:22:25 +03:00
phil235 9c44303661 Merge pull request #11057 from Cheridan/merely_pretending
Adds Astral Carpet Tiles
2015-08-09 11:51:35 +02:00
Cheridan 346848b875 Merge pull request #11084 from bgobandit/goofbotany
Adds several new reagent reactions to hydroponics.
2015-08-09 02:46:38 -05:00
Cheridan e7f95af201 Merge pull request #11092 from xxalpha/BOOOOOOOOOOOOM
Fixed inbuilt jetpacks dropping when suit is deleted.
2015-08-09 02:39:58 -05: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 a797fa80d7 words 2015-08-08 21:20:18 +02:00
AnturK 8a1e4435b6 Adds admin verb to reset latejoin spawns 2015-08-08 18:52:57 +02:00