082e860bbb
Merge pull request #5484 from tkdrg/permissionabuse
...
Improves Permissions Panel security
2014-10-27 13:05:41 -07:00
b2b0bec539
Merge pull request #5433 from phil235/WrapperFixes1
...
Wrapping papers fixes
2014-10-27 10:18:31 -07:00
c7a12290f4
Merge pull request #5466 from paprka/removejensen
...
Removes unused jensen glasses
2014-10-27 10:15:19 -07:00
d85999f7ee
Merge pull request #5438 from xxalpha/clownshoes
...
Moves shoe actions to human movement because the clown exists
2014-10-27 10:14:45 -07:00
2f9236bdb8
Merge pull request #5443 from paprka/flipriothelmet
...
Adds riot visor flipping
2014-10-27 10:09:41 -07:00
7eec063785
Merge pull request #5479 from Cheridan/rip_scratch
...
Adds Doc Scratch costume in reverse.
2014-10-27 10:08:47 -07:00
211bb20e53
Merge pull request #5445 from tkdrg/pointandlaugh
...
Makes point into a mob verb.
2014-10-26 20:33:53 -05:00
5bca7ee057
Merge pull request #5079 from Miauw62/thespookisreal
...
SPOOK STATION 13
2014-10-26 15:12:24 -07:00
090d61adf4
Merge branch 'master' of https://github.com/tgstation/-tg-station into flipriothelmet
...
Conflicts:
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2014-10-26 14:07:51 -07:00
57c723692a
The permissions panel now checks if the holder has superior rights before allowing a permission change.
2014-10-26 17:24:57 -03:00
64fb1c4578
reverts dmi changes
2014-10-26 01:56:29 -07:00
4525ab93cf
Adds Doc Scratch costume in reverse.
...
Since everyone's already mad anyway.
2014-10-26 03:37:56 -05:00
9f929d698a
extra jensen cosplay cleaning
2014-10-25 20:00:03 -07:00
bc71885a17
Merge pull request #5448 from paprka/hossystuff
...
Adds HoS drill hat, and violently guts jensen cosplay from HoS
2014-10-25 21:44:40 -05:00
c83bf83108
Fixes #2098
2014-10-25 22:54:25 -03:00
b37b2651d3
Point is now a mob verb to reduce lag
2014-10-25 22:54:17 -03:00
6a918f98c5
Merge pull request #5454 from MrStonedOne/t-t-t-tadaydb
...
Adds admin verb to reestablish connection to the database
2014-10-25 18:41:24 -07:00
5bf303da00
Merge pull request #5430 from scoopscoop/csscargoconsoles
...
Cargo console CSS visual tweaks
2014-10-25 16:31:26 -05:00
51a4bd7be6
drill sergeant hat for HoS instead of police
2014-10-25 13:51:36 -07:00
9a378933d2
Makes spookoween compile
2014-10-25 11:40:53 +00:00
a0d3a09ef8
Merge branch 'master' of https://github.com/tgstation/-tg-station into thespookisreal
...
Conflicts:
code/modules/events/carp_migration.dm
2014-10-25 11:29:07 +00:00
64ee84889d
Merge branch 'thespookisreal' of https://github.com/Menshin/-tg-station into thespookisreal
...
Conflicts:
code/modules/holiday/halloween.dm
2014-10-25 11:23:32 +00:00
de06436320
Makes re-establish db connection verb logic better
2014-10-24 12:34:07 -07:00
3ebd53b7c7
Adds new admin verb to reconnect to the database when the connection dies.
2014-10-24 11:21:15 -07:00
9cc31a3b85
adds HoS black police hat, and other changes
2014-10-24 04:19:11 -07:00
bea7f8989d
adds riot visor flipping
2014-10-23 20:31:48 -07:00
936d7bcdab
Moved shoe actions to human movement
2014-10-24 00:56:53 +01:00
107e5b5824
Rewrites simulated/Entered logic so its a tiny more efficient
2014-10-23 23:19:11 +01:00
0cc07336d8
Merge pull request #5423 from phil235/PandemicMsgFix1
...
Adding a message to the pandemic computer
2014-10-23 13:17:20 -07:00
242621b87c
Merge pull request #5422 from xxalpha/flashfix
...
Finish repathing flashes
2014-10-23 11:22:54 -07:00
8b6a8f179d
little fix
2014-10-23 19:51:12 +02: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
a0ae729ce3
Merge pull request #5420 from phil235/AnomalyFix
...
Fixes two bugs with anomalies
2014-10-23 09:27:28 -05:00
9d98640bc7
The supply shuttle, supply ordering, ore redemption and mining vendor consoles in cargo now use datum/browser/popups instead of user << browse so they don't look like random HTML pages.
2014-10-23 15:26:33 +03:00
3a98979572
Merge pull request #5393 from paprka/cooljackets
...
Adds bomber and leather jackets + toolbelt improvements
2014-10-22 16:43:42 -07:00
c0b1abac9d
Merge pull request #5409 from paprka/autoinjectorsgetfixed
...
Removes opencontainer flag from medipens
2014-10-22 14:42:12 -07:00
a54fc8ef73
Merge pull request #5410 from phil235/bookcarvingIconFix
...
Books keep their original icon when carved.
2014-10-22 14:41:57 -07: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
3a5eb0c1dc
Adding a message to the pandemic computer whenever it cannot detect a virus in the blood sample (either due to stealth or actual lack of virus). This will make stealth virus less confusing to players.
2014-10-22 22:08:57 +02:00
a4d707f00f
Also fixing the end() proc for pyroplastic anomaly.
2014-10-22 21:00:38 +02:00
e73abf676f
Merge branch 'master' of https://github.com/tgstation/-tg-station into AnomalyFix
2014-10-22 20:54:35 +02:00
a5450b0acb
Finishes repathing flashes
2014-10-22 19:09:43 +01:00
79c61500f1
Merge pull request #5399 from phil235/LaserGunFix
...
Fixes the lasergun icon never being empty.
2014-10-22 10:53:49 -07:00
2a0eeea1fb
Fixes two anomaly bugs. One: bluespace anomaly doing translocation despite being destroyed. Two: anomaly not checking for the signal code.
2014-10-22 17:39:09 +02:00
16d299e5c5
Merge pull request #5379 from optimumtact/revertclick
...
Revert my click cooldown changes
2014-10-21 18:39:21 -07:00
1ed3d50db2
Fixes the book changing icon when carved.
2014-10-21 23:51:41 +02:00
fdc3dfc85b
Removes opencontainer flag from medipens
2014-10-21 13:53:27 -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
c2fcd21499
Adding bluespace bodybags. Adding changelog.
2014-10-21 17:27:40 +02:00
hornygranny
Cheridan
paprka
tkdrg
Cheridan
Miauw62
MrStonedOne
xxalpha
phil235
scoopscoop