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
d2c918b0c8
Merge pull request #5387 from hornygranny/wakemeupbeforeyougogo
...
early launch time
2014-10-22 19:09:01 +01:00
91cfad7cb6
Merge pull request #5389 from hornygranny/sosleepy
...
changes turret emp_act to not hang MC
2014-10-22 19:08:39 +01:00
2ce3c1b635
Merge pull request #5397 from Jordie0608/nowweneedassistantsanctuaries
...
Adds assistant antag config to show server rev
2014-10-22 10:55:52 -07:00
b4135266b5
Merge pull request #5395 from paprka/edzipcuffs
...
Makes ED-209s use zipties
2014-10-22 10:54:24 -07:00
79c61500f1
Merge pull request #5399 from phil235/LaserGunFix
...
Fixes the lasergun icon never being empty.
2014-10-22 10:53:49 -07:00
7d02690a94
Merge pull request #5383 from Donkie/atmostankfixes
...
Fixed tank icons. Fixes #5374
2014-10-22 10:50:16 -07:00
76fa248653
Merge pull request #5401 from Donkie/atmosruntime
...
Fixed #5390 . Unary runtime
2014-10-22 10:49:13 -07:00
16d299e5c5
Merge pull request #5379 from optimumtact/revertclick
...
Revert my click cooldown changes
2014-10-21 18:39:21 -07:00
2a7af35a53
Merge pull request #5380 from paprka/mapedits
...
Adds lipstick to box and jackboots to non-sec areas
2014-10-21 18:25:31 -07: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
9a9f6c0a75
Fixed #5390
2014-10-21 18:34:28 +02: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
ebabe9af3a
Fixes the lasergun icon never being empty.
2014-10-21 15:36:18 +02:00
b1a1732b07
Adds assistant antag config to show server rev
2014-10-21 20:04:51 +11:00
78a7e3f76e
Makes ED-209s use zipties
2014-10-20 22:45:19 -07:00
87d2bd0aab
Merge pull request #5299 from phil235/BloodstainedNameFix
...
Fix for #5288
2014-10-20 20:19:55 -07:00
20329a3bdb
Merge pull request #5240 from paprka/assantag
...
Assistant antagonist config option
2014-10-20 20:19:08 -07:00
1c9c6d5950
Merge pull request #5249 from phil235/DisplacedGirderFix
...
Fix for #4602
2014-10-20 20:18:06 -07:00
8553f8765b
Merge pull request #5280 from Jordie0608/increasingquizzicality
...
Adds adminmoreinfo to Syndicate and Centcomm messages
2014-10-20 20:05:22 -07:00
d3b7bd5329
Merge pull request #5303 from hornygranny/howdoespolarbearknowwhatapplesis
...
nonhumans can no longer write
2014-10-20 22:05:01 -05:00
868db341f1
Merge pull request #5319 from phil235/InjectFix
...
Moving around while injecting a mob cancels the injection.
2014-10-20 20:04:39 -07:00
9c975b3018
Merge pull request #5372 from paprka/prisonjumpsuit
...
Fixes prisoner jumpsuit adjusting
2014-10-20 20:01:42 -07:00
8c77190eea
Merge pull request #5307 from Aranclanos/cameraqdellimbo
...
Camera EMP + qdel runtime fix.
2014-10-20 19:52:00 -07:00
ea591b26dc
Merge branch 'master' of https://github.com/tgstation/-tg-station into prisonjumpsuit
...
Conflicts:
icons/mob/uniform.dmi
2014-10-20 19:48:27 -07:00
1bba60d17f
Merge pull request #5346 from Incoming5643/clumpingmystyle
...
Returns the missing grassclump icon
2014-10-20 19:39:43 -07:00
514e5b78d7
Merge pull request #5369 from paprka/whizzard
...
Adds yellow wizard robe
2014-10-20 19:35:40 -07:00
45b2ed0d0e
Merge pull request #5248 from Jordie0608/helpimbeingoppressedbycode
...
Remove del-alls list of safes
2014-10-20 19:34:29 -07: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
afe171bb0a
Merge pull request #5313 from TZK13/Preferences-Setup-Fixes
...
Fixes the previews in the character setup screen
2014-10-20 19:32:48 -07:00
6208ffc53c
Merge pull request #5305 from Boggart/nukefix
...
Nuke href exploit fix
2014-10-20 19:31:17 -07:00
55ff8ab432
Merge pull request #5206 from paprka/usedcuffs
...
Used zipcuffs name change
2014-10-20 19:28:10 -07:00
9e2dc67e86
Merge pull request #5363 from Cheridan/better_noms
...
Anomaly Event Changes
2014-10-20 19:24:04 -07:00
d74690a7bf
Merge pull request #5308 from Menshin/radiation_decreasing_fix
...
Fixes radiation levels getting stuck
2014-10-20 19:20:19 -07:00
18c669a4fc
Merge pull request #5364 from JJRcop/Reactivated-drones-still-in-dead-mob-list
...
Fixes a bug with reactivated drones not being removed from the dead_mob_list
2014-10-20 19:19:45 -07:00
6b108a6c6b
Merge pull request #5367 from paprka/rollinfix
...
Fixes jumpsuit rolling for random jumpsuits
2014-10-20 19:17:56 -07:00
0623553baa
moved lipstick to formalwear crate
2014-10-20 15:52:57 -07:00
acbf2d0e0a
changes turret emp_act to not hang MC
2014-10-20 15:23:56 -07:00
2bceb60529
emergency shuttle being emagged or launched early will now log how early it left the station
2014-10-20 11:33:50 -07:00
b7de714fa7
Merge pull request #5257 from Incoming5643/WhatAJobber
...
Manage Free Slots
2014-10-20 14:35:18 +01:00
1ebf27f0b5
Fixes #5374
2014-10-20 13:40:25 +02:00
fd3287f688
Fixed tanks
2014-10-20 13:37:25 +02:00
adf252df9b
Keep the define around as that is a good idea
2014-10-20 22:49:06 +13:00
6eb4793801
Revert "Adds click cooldown to clicking on mobs Fixes #4812 "
...
This reverts commit 7116584db1
2014-10-20 22:23:19 +13:00
5f8380304a
Revert "Make handcuff click cooldown a define"
...
This reverts commit 7da7fdbaab
2014-10-20 22:23:07 +13:00
25d587a483
Revert "Cleaning up unecessary cooldown changes"
...
This reverts commit 970c61844f
2014-10-20 22:22:51 +13:00
b3de61552f
Revert "Defines for the define god"
...
This reverts commit f737f7889c
2014-10-20 22:22:38 +13:00
c50c26a48f
Revert "Add the click cooldown define to the last special defines"
...
This reverts commit 5595d57f57
2014-10-20 22:22:23 +13:00
phil235
Remie Richards
hornygranny
Cheridan
Daniel
Jordie
paprka
Francis