b2b0bec539
Merge pull request #5433 from phil235/WrapperFixes1
...
Wrapping papers fixes
2014-10-27 10:18:31 -07:00
ce73323823
Fixes #4311
2014-10-25 23:01:27 -03:00
242621b87c
Merge pull request #5422 from xxalpha/flashfix
...
Finish repathing flashes
2014-10-23 11:22:54 -07:00
b971a09bcd
Wrapping something with package wrapper now gives a message.
...
Adding a check so clicking an already giftwrapped item doesn't show the wrapping message.
Adding nobludgeon flag to wrapping paper to remove attack messages
Removing w_class line from package wrapper because already in its parent.
Remove the unnecessary message (box is full/packagewrapper doesn't fit in the box) when wrapping box.
Fixes not being able to wrap box with just one single package wrapper left.
Fixing attack_log (fix issue4180) and only adds log when the wrapping succeeds.
Now using wrapping paper actually uses its amount.
when all used, they will drop cardboard tube like intended.
Fixes issue4207
Fixes not being able to re-add wrapping paper and package wrapper to themselves like proper stacks.
New sprite for both paperwrap and cardboard tube. (from Nienhaus)
2014-10-23 19:30:09 +02:00
72a8a82c7e
Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity
...
Conflicts:
code/modules/mob/living/living.dm
2014-10-22 13:26:35 -07:00
a5450b0acb
Finishes repathing flashes
2014-10-22 19:09:43 +01:00
a5e3851b99
Merge pull request #5216 from phil235/bodybagfix1
...
closets can no longer contain a near infinite amount of mobs.
2014-10-21 12:15:30 -05:00
e556867a58
Merge pull request #5277 from paprka/newshotguns
...
Adds improvised shotguns and fixes paths for wrap paper
2014-10-21 09:51:35 -07:00
c2fcd21499
Adding bluespace bodybags. Adding changelog.
2014-10-21 17:27:40 +02:00
56c853f9d6
Merge branch 'master' of https://github.com/tgstation/-tg-station into bodybagfix1
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/mouse.dm
2014-10-21 15:58:39 +02:00
51277f03c0
Merge pull request #5203 from Menshin/href_stacks_multiplier_fix
...
Prevent href exploit with stacks multipliers
2014-10-20 19:34:04 -07:00
55ff8ab432
Merge pull request #5206 from paprka/usedcuffs
...
Used zipcuffs name change
2014-10-20 19:28:10 -07:00
e5e6ded884
singularity is now OOP
2014-10-20 16:36:00 -07:00
455b526cc1
Merge pull request #5318 from phil235/MsgFix2
...
More messages fixed
2014-10-19 21:39:06 -05:00
2a8e772131
Merge branch 'master' of https://github.com/tgstation/-tg-station into newshotguns
...
Conflicts:
code/modules/projectiles/ammunition/magazines.dm
code/modules/projectiles/guns/projectile/shotgun.dm
icons/mob/back.dmi
icons/obj/gun.dmi
2014-10-19 17:30:47 -07:00
cb05cb64d1
Merge pull request #5306 from Aranclanos/flashruntime
...
Flashes runtime fix
2014-10-19 18:47:18 -05:00
4adb8c0c9a
Merge pull request #5316 from xxalpha/fix_flasher
...
Fixes cyborgs being able to add their flashes to things
2014-10-19 17:44:30 -05:00
21b198dc2c
Merge pull request #5314 from MrPerson/qdel_radios
...
Make radios garbage collect
2014-10-19 17:42:06 -05:00
091cbcca2c
deleted bad lines
2014-10-19 04:57:14 +01:00
d9dafa9649
Fix cyborg flashes being useable in flashers and cyborg heads.
2014-10-19 04:35:10 +01:00
9b9481d65c
Changes many span classes.
...
Replaces for(mob in oviewers) show_message() with visible_message() when possible.
Fixes the absolute pathing in Ninja code.
Fixes facehugger attack messages being bold red for third party (only the first leap message will stay bold red for third party, for better visibility)
Standardizes vomiting message
Fixes mech occupant not receiving any attack messages when the mech is attacked.
2014-10-18 16:00:38 +02:00
ec9f595b1f
Make radios garbage collect
2014-10-18 00:05:03 -07:00
134c4d6209
Fixes a runtime with flashes when they burn out without user, now they'll display the burn out message from the src instead.
2014-10-17 16:42:51 -03:00
929662ad3a
moved files and fixed tablecrafting
2014-10-17 10:30:04 -07:00
c936f3134d
Merge pull request #5268 from paprka/zipeties
...
fixes zipeties typo
2014-10-17 07:35:07 -07:00
e124c29f8d
Merge pull request #5201 from Cheridan/permits
...
Adds Construction Permits
2014-10-17 05:24:37 +01:00
85478315e6
Merge branch 'master' of https://github.com/tgstation/-tg-station into zipeties
2014-10-16 09:28:11 -07:00
c29cc89864
Merge branch 'master' of https://github.com/tgstation/-tg-station into newshotguns
...
Conflicts:
icons/obj/gun.dmi
2014-10-16 09:26:26 -07:00
a5638c7107
Merge pull request #5152 from paprka/medicalbeltsstuff
...
Hyposprays fit in medibelts now
2014-10-16 08:46:54 -05:00
13b59d2d0e
Merge pull request #5165 from paprka/INGLEWOODINGLEINGLEWOOD
...
Expands medipens & mining
2014-10-16 08:44:36 -05:00
01e7b0af6d
Merge pull request #5218 from Perakp/dnaInjectorGarbage
...
Garbage collect dna injectors
2014-10-16 08:34:50 -05:00
17c9aaa6dd
Merge pull request #5263 from Aranclanos/electropackrevamp
...
Electropack fixes
2014-10-16 08:08:57 -05:00
53cb161add
Merge pull request #5245 from paprka/removespammessages
...
Removes a few spammable visible messages
2014-10-15 16:41:09 -07:00
54b575523a
removes zippo changes
2014-10-15 16:32:51 -07:00
4c7831c4fd
Merge branch 'master' of https://github.com/tgstation/-tg-station into zipeties
...
Conflicts:
code/game/machinery/bots/secbot.dm
2014-10-15 13:32:24 -07:00
d244fd6bbd
initial commit
2014-10-15 13:29:19 -07:00
9077c173d1
Merge pull request #4759 from Donkie/pipes2
...
Major Pipe Upgrade Hashtag 2
2014-10-15 11:36:25 -03:00
bd2f0692d3
Merge pull request #5222 from phil235/c4GibFix
...
You can no longer gib mob with c4+signaler
2014-10-15 10:43:20 -03:00
a31b372ea7
Merge pull request #5171 from phil235/ed209fix
...
A lot of secbot/ed-209 fixes.
2014-10-15 10:42:30 -03:00
7bb012127c
Merge pull request #5235 from phil235/CollapsibleRollerBed
...
Collapsible Rollerbed
2014-10-15 11:54:48 +01:00
dc9d194706
fixes zipeties typo
2014-10-15 00:07:42 -07:00
a1d49cfeb4
Changes the path of electropacks from objitemdeviceradioelectropack to objitemdeviceelectropack.
...
Fixes some runtimes related to electropacks.
Securing electropacks will no longer be required to use a helmet on it, same with dissembling the shockkit with a wrench or placing it in a chair.
Removes the atom var 'moved_recently' that was only used by electropacks (really). Now the electropack will have an inner cooldown instead.
The cooldown of the shock will be 10 seconds, giving the shocked person some small time to move in-between shocks (the shock gives you 5 of weakened).
2014-10-14 21:44:56 -03:00
11b8235f66
Href exploit fixing : the bugfree edition
2014-10-14 23:10:38 +02:00
40ab91a060
removes a few spammable visible messages
2014-10-14 04:58:42 -07:00
cd78c2b067
Adding puppies and kittens to the small mob category.
...
Increasing mob_storage_capacity for closet and bodybag to 4 and 6 respectively.
2014-10-13 19:03:56 +02:00
619a38ad89
Adds the ability to collapse rollerbed (from baystation). Fixes being able to pick up pill bottles and fold bodybags through windows via click drag.
2014-10-13 17:17:53 +02:00
4640999701
Merge pull request #5199 from paprka/telebatonlog
...
stun logging for telebaton
2014-10-13 11:48:17 +01:00
399977d882
Merge pull request #5095 from MrPerson/table_module
...
Move table crafting into the modules folder plus improvements
2014-10-13 10:42:16 +01:00
739cc29dbd
removes typecasting from zipcuffs cutting
2014-10-12 14:02:04 -07:00
8986181e44
fixes ziptie bug
2014-10-12 13:39:55 -07:00
hornygranny
tkdrg
phil235
xxalpha
Cheridan
paprka
MrPerson
Aranclanos
Remie Richards
Menshin