cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 04:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,667 Commits 61 Branches 14 Tags
44d30afd20913dd148cd3fdf1062f9859cd8db95
Commit Graph

1132 Commits

Author SHA1 Message Date
phil235
d2d0888432 Merge pull request #7726 from xxalpha/traymesons 
Mesons+T-Ray = Engineering Goggles
 2015-03-02 19:24:06 +01:00
Cheridan
9f62e2c387 Merge pull request #8055 from xxalpha/xxmas 
Removes Santa Hats from security wardrobe closets and the festivus pole from RD's office.
 2015-03-01 20:04:52 -06:00
Razharas
111cb2a009 Merge pull request #8018 from phil235/BugFixA 
A bundle of fixes
 2015-03-01 06:44:02 +03:00
Razharas
960cc8dff6 Merge pull request #8021 from RemieRichards/AltClick-PixelPlacement-InteractionFix 
Table-Item Pixel Placement Improvements
 2015-03-01 06:42:44 +03:00
Remie Richards
8cee97f54f Merge pull request #7942 from dannno/nothingmatters 
THE OWL RETURNS
 2015-02-28 16:06:35 +00:00
Razharas
4475f541b9 Merge pull request #8033 from TheVekter/medbackpacks 
Gives Medical professions and Botany unique backpacks and satchels
 2015-02-28 08:42:20 +03:00
TheVekter
52c5abd536 Adds new backpacks to job lockers also changelog 2015-02-27 20:26:17 -06:00
xxalpha
7859dd2fdf Removes Santa Hats from security wardrobe closets and other. 2015-02-28 01:01:19 +00:00
xxalpha
f9ebb2cff7 Merge remote-tracking branch 'upstream/master' into traymesons 
Conflicts:
	code/modules/research/designs.dm
	icons/mob/eyes.dmi
	icons/obj/clothing/glasses.dmi
 2015-02-27 21:15:01 +00:00
dannno
2474e84299 REALLY FIXED THIS TIME LOL 2015-02-27 15:59:50 -05:00
dannno
027eccedbc conflicts fixed 2015-02-27 14:01:42 -05:00
Mandurrrh
d2f44872aa Adds emp, emag, and repairs for barsign. 2015-02-27 12:01:09 -05:00
Remie Richards
f7d3692a6b Clamps the value of pixel placed items between -(world.icon_size/2) and world.icon_size/2, so -16 and 16 respectively. 2015-02-26 23:17:59 +00:00
dannno
9b1fa2479b conflict fixing + changelog 2015-02-26 16:48:11 -05:00
dannno
23ecfeebf8 THE OWL RETURNS: PART 4: PRODUCT PLACEMENT 
- adds The Owl and The Griffin prize toys to the arcade
- adds The Owl and The Griffin posters (legit and contraband respectively)
- adds The Nest barsign
 2015-02-26 16:36:44 -05:00
phil235
7171cd252b Fixes no blood dna on Mulebot and its blood tracks. 
Fixes putting buckled mobs onto morgue trays.
Fixes mob pixel offset when unbuckled from roller bed.
Fixes blood trail appearing when pulling a patient on a roller bed.
Fixes other minor stuff.
 2015-02-26 19:31:55 +01:00
hornygranny
f7342415c1 Merge pull request #7959 from phil235/AttackSelfTKFix 
A bunch of fixes
 2015-02-25 19:54:36 -08:00
Swag McYolosteinen
4826037b00 Merge pull request #7981 from MrStonedOne/revert-7970-removegaytider 
Revert "Removes grey tide barsign"
 2015-02-25 18:47:53 +01:00
MrStonedOne
33d0507c8d Suggested changes to graytide sign's desc wording 2015-02-25 08:10:42 -08:00
Razharas
05b2ec1e5f Merge pull request #7420 from Steelpoint/HoSGun 
Head of Security's Personal Firearm
 2015-02-25 10:27:22 +03:00
MrStonedOne
48ce33f3cb Revert "Removes grey tide barsign" 2015-02-24 23:04:16 -08:00
Cheridan
9ba1dfaa26 Merge pull request #7970 from paprka/removegaytider 
Removes grey tide barsign
 2015-02-25 00:29:36 -06:00
Steelpoint
9ce2add084 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun 
Conflicts:
	icons/obj/guns/energy.dmi
 2015-02-25 14:10:54 +08:00
paprka
1d552123dc hos gun revert 2015-02-24 21:54:48 -08:00
paprka
393123b50b Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs 
Conflicts:
	code/modules/projectiles/gun.dm
	icons/obj/guns/energy.dmi
 2015-02-24 20:03:33 -08:00
Steelpoint
da53175ad5 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun 
Conflicts:
	icons/mob/inhands/guns_lefthand.dmi
	icons/mob/inhands/guns_righthand.dmi
	icons/obj/guns/energy.dmi
 2015-02-25 11:44:27 +08:00
paprka
830b57afd5 removes grey tide barsign 2015-02-24 15:32:58 -08:00
Remie Richards
b1ff6b7220 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams 
Conflicts:
	code/game/turfs/simulated/floor/light_floor.dm
 2015-02-24 22:16:53 +00:00
phil235
79de9615dc Fixes not being able to prime grenade, toggle lamps and other attack_self things with TK. 
Fixes the blobbernaut death animation looping.
Fixes armchair layer being above ghost layer.
Fixes chloral hydrate metabolization rate (and 2 other reagents)
Fixes a typo in closet/attack_self() .
 2015-02-24 16:36:40 +01:00
Swag McYolosteinen
984b7cb8f6 Merge pull request #7738 from Incoming5643/mediborg_inbuiltstretcher 
Mediborg Improvement Drive: Roller Robo Da
 2015-02-23 17:10:43 +01:00
hornygranny
fe1ad1a152 Merge pull request #7861 from phil235/OfficeChairLayerFix 
Fixes office chair layer not updating when moving the chair around.
 2015-02-22 20:19:13 -08:00
hornygranny
c0c8a739e2 Merge pull request #7721 from paprka/miening 
Mining & mine-related chem changes
 2015-02-22 20:17:24 -08:00
Steelpoint
1db8a718a6 ChangeSpawnAreas 2015-02-23 01:48:20 +08:00
Swag McYolosteinen
1035d95f90 Merge pull request #7716 from paprka/megaphoney 
Adds megaphones
 2015-02-22 12:58:49 +01:00
phil235
491bc2380b Fixes office chair layer not updating when moving the chair around. 2015-02-21 11:40:58 +01:00
Mandurrrh
df57ea312b add singulo description 2015-02-20 12:56:11 -05:00
Mandurrrh
1301fdd9ab Fixes maps, adds emp barsign, fixes merge conflicts. 2015-02-20 12:08:04 -05:00
Remie Richards
5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite. 
Items reset their pixel_x and pixel_y values on pickup.
 2015-02-19 13:02:43 +00:00
paprka
dc4c4ea90b Merge branch 'master' of https://github.com/tgstation/-tg-station into megaphoney 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
 2015-02-18 23:15:15 -08:00
Cheridan
116143006e Merge pull request #7746 from Incoming5643/BuyOneGetOneFreePets 
Fixes the horrible injustice of getting too many pets
 2015-02-18 09:38:24 -06:00
paprka
074a139576 Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs 
Conflicts:
	icons/obj/guns/energy.dmi
 2015-02-18 02:29:07 -08:00
Steelpoint
8b53405b17 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun 
Conflicts:
	icons/mob/inhands/guns_lefthand.dmi
	icons/mob/inhands/guns_righthand.dmi
	icons/obj/guns/energy.dmi
 2015-02-18 12:50:05 +08:00
paprka
8b12b14f59 hospistol and disabler stun revolver 2015-02-15 13:31:31 -08:00
Cheridan
15439b8c4e Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix 
Conflicts:
	code/game/gamemodes/wizard/artefact.dm
 2015-02-15 10:27:50 -06:00
Incoming
136b3ed67b Fixes the horrible injustice of getting too many pets 2015-02-14 23:54:20 -05:00
Cheridan
76f101de63 Merge pull request #7614 from paprka/preffer 
Hard-light hazard holotape
 2015-02-14 21:59:14 -06:00
Incoming
d53163bded Adds an onboard roller bed dock that the mediborg can deploy wherever they need for on the spot triage/transportation/surgery/kidnapping. It can only hold one roller bed, but starts with one. This isn't regeneratable, so you can be a dick and steal the borg's bed and they'll have to go back to medbay for a replacement. 2015-02-14 17:52:38 -05:00
xxalpha
28d1e9bad2 Several additions and new sprites. 
Reverts glasses.dm
 2015-02-14 19:24:41 +00:00
phil235
135293bedf Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration. 
Fixes Alien embryo processing that was processed twice.
 2015-02-14 14:18:49 +01:00
paprka
88760896ad initial commit 2015-02-13 20:59:39 -08:00