cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 08:34:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,705 Commits 61 Branches 14 Tags
6ac3d8f2e8345ede59970e272139f3307429443c
Commit Graph

306 Commits

Author SHA1 Message Date
tkdrg
e03c5129da Makes storage items update properly on insertion 
Previously, it would only update the storage view for usr, so it would
look wrong to any other players which are interacting with the same
storage item at the same time.
 2014-11-20 14:00:17 -03:00
Razharas
4f81da5bdf Merge pull request #5797 from Steelpoint/BeltFix 
Fix: SecBelts can hold Tear Gas Grenades
 2014-11-15 01:03:46 +03:00
Remie Richards
17607d0aa2 Merge pull request #5776 from MrPerson/throwing_changes 
Throwing bugfixes
 2014-11-14 18:04:00 +00:00
Menshin
cdd5128d47 Removed hilarious but useless sleep() in closets/boxes New() 2014-11-10 01:59:32 +01:00
Steelpoint
e02e2f5c0b TearGas 2014-11-10 02:16:46 +08:00
MrPerson
c159878ace Throwing bugfixes 
Removed an unused client verb, changed a usr to src where they're the same mob, and changed a type == check to istype().

Allow turning on throw mode when clicking the UI button (hotkeys already allow you to do this).
Disallow throwing when not on a turf.
Fixes #4823

Make storage items close out the onscreen stuff when they get thrown.
Fixes #5296
 2014-11-09 00:29:20 -08:00
Cheridan
15b16e1f67 Merge pull request #5726 from paprka/traitorbeltthing 
Adds disguised med analyzer to medibelts
 2014-11-07 23:39:56 -06:00
Cheridan
3f16a966b2 Merge pull request #5712 from xxalpha/amilli 
Increases gold content per Robust Gold cigarette to 1
 2014-11-07 10:09:54 -06:00
paprka
e5db75d756 adds disguised med analyzer to medibelts 2014-11-06 21:36:54 -08:00
xxalpha
e1a06faa9b Increases gold content per Robust Gold cigarette to 1 2014-11-06 18:23:48 +00:00
paprka
b99499e277 fixes utility medipen bundle for miners 2014-11-05 18:02:14 -08:00
hornygranny
b8f0ef4efe Merge pull request #5541 from xxalpha/cigarettes 
New Cigarette Packs
 2014-11-03 18:49:29 -08:00
hornygranny
7e4688e3f6 Merge pull request #5427 from paprka/littlejanitorthings 
Soap, lube, and janitor tweaks
 2014-11-03 17:19:37 -08:00
hornygranny
6e11157661 Merge pull request #5520 from paprka/minerscrubs 
Improves mining equipment prices, rebalances medipens
 2014-11-03 17:12:02 -08:00
phil235
128c9222e5 Adding checks for stun, restrained to many object verbs. 
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
 2014-11-01 19:18:01 +01:00
xxalpha
1ae24af71e Added reagents to some cigarette packs 2014-10-30 01:03:51 +00:00
xxalpha
7803f296ba New Cigarette Packs 2014-10-30 00:08:14 +00:00
paprka
1b91ab24ce Improves mining equipment locker and rewards system, and buffs kinetic accelerator 2014-10-28 15:42:55 -07:00
hornygranny
b2b0bec539 Merge pull request #5433 from phil235/WrapperFixes1 
Wrapping papers fixes
 2014-10-27 10:18:31 -07:00
paprka
b925becf67 fixes trash bag capacity 2014-10-23 13:03:41 -07: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
paprka
7f2feabbd8 soap, lube, and janitor stuff 2014-10-23 01:44:19 -07:00
Hornygranny
e5e6ded884 singularity is now OOP 2014-10-20 16:36:00 -07:00
Cheridan
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
xxalpha
d9dafa9649 Fix cyborg flashes being useable in flashers and cyborg heads. 2014-10-19 04:35:10 +01:00
Remie Richards
e124c29f8d Merge pull request #5201 from Cheridan/permits 
Adds Construction Permits
 2014-10-17 05:24:37 +01:00
Cheridan
a5638c7107 Merge pull request #5152 from paprka/medicalbeltsstuff 
Hyposprays fit in medibelts now
 2014-10-16 08:46:54 -05:00
Cheridan
13b59d2d0e Merge pull request #5165 from paprka/INGLEWOODINGLEINGLEWOOD 
Expands medipens & mining
 2014-10-16 08:44:36 -05:00
Remie Richards
7bb012127c Merge pull request #5235 from phil235/CollapsibleRollerBed 
Collapsible Rollerbed
 2014-10-15 11:54:48 +01:00
phil235
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
Cheridan
5eb6a82970 Merge branch 'master' of https://github.com/tgstation/-tg-station into permits 
Conflicts:
	icons/obj/items.dmi
 2014-10-11 17:48:46 -05:00
Cheridan
84e7121903 Adds construction permits 2014-10-11 17:39:27 -05:00
Remie Richards
b54ed5b4e5 Merge pull request #5137 from paprka/holosignoff 
Adds holographic janitor signs
 2014-10-10 17:41:41 +01:00
Remie Richards
b9f4a54c56 Merge pull request #5132 from paprka/tacticool 
Changes HUD in syndicate medkit to NV HUD
 2014-10-10 17:29:18 +01:00
paprka
b2ca9776fd expands medipens 2014-10-09 18:01:35 -07:00
paprka
fa55262f83 hyposprays fit in medibelts now 2014-10-09 14:40:14 -07:00
hornygranny
30b3294adc Merge pull request #5123 from paprka/zippycuffs 
Adds zipties
 2014-10-08 21:12:05 -07:00
paprka
149c9a3a76 big update 2014-10-08 20:58:43 -07:00
Remie Richards
23651b54f0 Merge pull request #5093 from paprka/medipens 
Replaces a lot of inaprovaline syringes with medipens
 2014-10-08 22:15:52 +01:00
paprka
5457503c67 adds holographic janitor signs 2014-10-08 13:48:44 -07:00
paprka
d61e4ac943 big commit, handcuff overhaul 2014-10-08 13:19:54 -07:00
paprka
668bb52a1e Merge branch 'master' of https://github.com/tgstation/-tg-station into zippycuffs 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-10-08 07:17:42 -07:00
paprka
703c73247e changes HUD to NV HUD 2014-10-07 20:37:11 -07:00
MrPerson
9797435df7 Merge pull request #5109 from paprka/telebatonstorage 
Telebaton storage tweak
 2014-10-07 14:25:56 -07:00
Cheridan
f96b017149 Merge pull request #5097 from phil235/Msg1Fix 
Fixing a lot of messages
 2014-10-07 12:09:01 -05:00
paprka
0e1083fc39 adds zipcuffs 2014-10-06 20:35:10 -07:00
Cheridan
66304667cf Merge branch 'dualswordstake3' of https://github.com/Aranclanos/-tg-station into Aranclanos-dualswordstake3 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
	code/datums/uplink_item.dm
 2014-10-06 19:27:14 -05:00
paprka
7c95d3b79b stupid compile errors 2014-10-06 00:45:22 -07:00
paprka
89795c95bf telebaton storage 2014-10-05 23:10:55 -07:00
phil235
dd7a3b7fbc Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix 
Conflicts:
	code/modules/admin/admin_verbs.dm
 2014-10-05 13:48:11 +02:00