cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-22 15:05:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,752 Commits 61 Branches 14 Tags
2dabc8fd39d0cbb517de192843f9da86c07270dc
Commit Graph

11885 Commits

Author SHA1 Message Date
JJRcop
2dabc8fd39 Turns /obj/screen/Click() into subtypes 2014-10-30 15:49:38 -04:00
hornygranny
082e860bbb Merge pull request #5484 from tkdrg/permissionabuse 
Improves Permissions Panel security
 2014-10-27 13:05:41 -07:00
hornygranny
b2b0bec539 Merge pull request #5433 from phil235/WrapperFixes1 
Wrapping papers fixes
 2014-10-27 10:18:31 -07:00
hornygranny
c7a12290f4 Merge pull request #5466 from paprka/removejensen 
Removes unused jensen glasses
 2014-10-27 10:15:19 -07:00
hornygranny
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
hornygranny
0e668cb0f3 Merge pull request #5451 from tkdrg/yayfabricatorbugs 
Fixes fabricator stack removal
 2014-10-27 10:12:26 -07:00
hornygranny
2f9236bdb8 Merge pull request #5443 from paprka/flipriothelmet 
Adds riot visor flipping
 2014-10-27 10:09:41 -07:00
hornygranny
7eec063785 Merge pull request #5479 from Cheridan/rip_scratch 
Adds Doc Scratch costume in reverse.
 2014-10-27 10:08:47 -07:00
Cheridan
211bb20e53 Merge pull request #5445 from tkdrg/pointandlaugh 
Makes point into a mob verb.
 2014-10-26 20:33:53 -05:00
hornygranny
5bca7ee057 Merge pull request #5079 from Miauw62/thespookisreal 
SPOOK STATION 13
 2014-10-26 15:12:24 -07:00
paprka
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
tkdrg
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
Cheridan
a30b3bddf5 Merge pull request #5434 from tkdrg/microfix 
Fixes #4311 Radioactive Microlaser Interface
 2014-10-26 13:56:48 -05:00
Cheridan
ce4f07bf23 Merge pull request #5429 from Menshin/alarm_runtimes_fix 
Fixes alarms runtimes
 2014-10-26 13:45:23 -05:00
paprka
64fb1c4578 reverts dmi changes 2014-10-26 01:56:29 -07:00
Aranclanos
0e34f72d8e Merge pull request #5452 from phil235/NukeDiskLogFix 
Fixes the nuke disk coordinates in the admin log message
 2014-10-26 05:40:07 -03:00
Cheridan
4525ab93cf Adds Doc Scratch costume in reverse. 
Since everyone's already mad anyway.
 2014-10-26 03:37:56 -05:00
Cheridan
bd5e5ade40 Merge pull request #5411 from scoopscoop/crewconsoletweak 
Crew monitoring console department grouping
 2014-10-25 22:34:58 -05:00
paprka
9f929d698a extra jensen cosplay cleaning 2014-10-25 20:00:03 -07:00
Cheridan
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
tkdrg
ce73323823 Fixes #4311 2014-10-25 23:01:27 -03:00
tkdrg
c83bf83108 Fixes #2098 2014-10-25 22:54:25 -03:00
tkdrg
b37b2651d3 Point is now a mob verb to reduce lag 2014-10-25 22:54:17 -03:00
tkdrg
6eb4d6200f Fixes #5161 2014-10-25 22:49:53 -03:00
hornygranny
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
Cheridan
5bf303da00 Merge pull request #5430 from scoopscoop/csscargoconsoles 
Cargo console CSS visual tweaks
 2014-10-25 16:31:26 -05:00
paprka
51a4bd7be6 drill sergeant hat for HoS instead of police 2014-10-25 13:51:36 -07:00
Miauw62
9a378933d2 Makes spookoween compile 2014-10-25 11:40:53 +00:00
Miauw62
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
Miauw62
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
MrStonedOne
de06436320 Makes re-establish db connection verb logic better 2014-10-24 12:34:07 -07:00
MrStonedOne
3ebd53b7c7 Adds new admin verb to reconnect to the database when the connection dies. 2014-10-24 11:21:15 -07:00
phil235
86a2c8bf47 Fixes the nuke disk coordinates in the admin log message 2014-10-24 17:34:33 +02:00
paprka
9cc31a3b85 adds HoS black police hat, and other changes 2014-10-24 04:19:11 -07:00
paprka
bea7f8989d adds riot visor flipping 2014-10-23 20:31:48 -07:00
paprka
e9faed8b5a adds a delay to removing flashes from flashers 2014-10-23 17:16:46 -07:00
xxalpha
19c9c7625d Cleaning 2014-10-24 00:58:56 +01:00
xxalpha
936d7bcdab Moved shoe actions to human movement 2014-10-24 00:56:53 +01:00
xxalpha
107e5b5824 Rewrites simulated/Entered logic so its a tiny more efficient 2014-10-23 23:19:11 +01:00
hornygranny
0cc07336d8 Merge pull request #5423 from phil235/PandemicMsgFix1 
Adding a message to the pandemic computer
 2014-10-23 13:17:20 -07:00
hornygranny
0885d546c7 Merge pull request #5424 from phil235/RetrovirusCureFix 
Fixes Space retrovirus being incurable.
 2014-10-23 13:16:41 -07:00
hornygranny
242621b87c Merge pull request #5422 from xxalpha/flashfix 
Finish repathing flashes
 2014-10-23 11:22:54 -07:00
hornygranny
524011f70a Merge pull request #5419 from Perakp/lesserFix 
Fixes changelings deleting themselves with lesser/human form.
 2014-10-23 11:09:46 -07:00
phil235
8b6a8f179d little fix 2014-10-23 19:51:12 +02:00
phil235
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
Cheridan
a0ae729ce3 Merge pull request #5420 from phil235/AnomalyFix 
Fixes two bugs with anomalies
 2014-10-23 09:27:28 -05:00
scoopscoop
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
Menshin
46a7d7ab30 Alarms change_power now check if there's a still a loc before calling spawned update_icon (fixes #5415) 2014-10-23 12:14:56 +02:00
hornygranny
83632ade2d Merge pull request #5179 from paprka/cultstuff 
Changes cult runes to allow constructs to help with most runes
 2014-10-22 16:45:07 -07:00
hornygranny
3a98979572 Merge pull request #5393 from paprka/cooljackets 
Adds bomber and leather jackets + toolbelt improvements
 2014-10-22 16:43:42 -07:00