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

2738 Commits

Author SHA1 Message Date
Swag McYolosteinen
5fcf0570b7 Merge pull request #8118 from Mandurrrh/pdabugfix 
Fixes GhostPDA bug making it show in lobby. Please merge quick.
 2015-03-03 11:26:48 +01:00
Swag McYolosteinen
c2290c6c5c Merge pull request #7913 from phil235/NewPlants 
Adds new plants to botany
 2015-03-03 11:23:32 +01:00
Mandurrrh
c52a630a17 Fixes GhostPDA bug making it show in lobby. 2015-03-02 20:52:46 -05:00
Swag McYolosteinen
4272ada464 Merge pull request #8042 from Mandurrrh/ghostpda 
Adds the ability to see pda messages in Deadchat
 2015-03-02 19:56:28 +01:00
phil235
d2d0888432 Merge pull request #7726 from xxalpha/traymesons 
Mesons+T-Ray = Engineering Goggles
 2015-03-02 19:24:06 +01:00
Mandurrrh
cde9de9e85 merge commits 2015-03-02 12:40:16 -05:00
Mandurrrh
da6d3fc2cd Creates a separate toggle for ghosts to see pda messages! 2015-03-02 10:57:25 -05:00
Swag McYolosteinen
969b301930 Merge pull request #8028 from Cheridan/foam_hose 
Fixes metal foam dispenser mode for atmos backpack tank.
 2015-03-02 16:47:29 +01:00
phil235
d856e240c2 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants 
Conflicts:
	icons/mob/head.dmi
 2015-03-02 13:45:15 +01:00
Remie Richards
8cee97f54f Merge pull request #7942 from dannno/nothingmatters 
THE OWL RETURNS
 2015-02-28 16:06:35 +00:00
Mandurrrh
e2d77899fa Change log and changes toggling ghostears to toggling ghostwhisper 2015-02-28 09:01:21 -05:00
TheVekter
b794cf5211 New Botany backpack and satchel. Also fixes satchel spawning without iconstate. 2015-02-27 20:02:24 -06: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
Mandurrrh
a0e19a466f Adds the ability to see pda messages with GhostEars toggled in deadchat. Port from bay. 2015-02-27 14:27:11 -05:00
TheVekter
abee661784 Adds in Nienhaus' departmental backpacks and fixes itemstate for a few satchels. 2015-02-26 23:39:27 -06:00
Cheridan
bcd3a5b3b7 Fixes metal foam dispenser mode for atmos backpack tank. 
>>you will never refactor something without overlooking something dumb and breaking it
 2015-02-26 22:26:12 -06: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
809a1be279 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants 
Conflicts:
	icons/mob/head.dmi
 2015-02-25 18:50:42 +01:00
Razharas
588c79873f Merge pull request #7562 from Iamgoofball/drugs 
GOONCHEM: Part 4: Pyrotechnics, Drugs, and Misc. Chemicals
 2015-02-25 08:26:21 +03:00
Iamgoofball
c0ae53a566 changes and shit, adds prespawn colorful smoke grenade for fun times and adminning 2015-02-24 20:15:06 -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
23812bfabc Merge pull request #7901 from Mandurrrh/holotapefix 
Fixes  #7883 Borgs can't pass through holotape
 2015-02-24 19:22:19 +01:00
hornygranny
1c7c6fb40c Merge pull request #7929 from phil235/GauzeMessageFix 
Fix applying gauze on already bandaged and non bleeding person, the oper...
 2015-02-24 10:12:33 -08:00
phil235
2d5fe2b41e Merge pull request #7922 from Mandurrrh/clownbugs 
Fixes #7910 and #7909 clown related bugs.
 2015-02-24 18:56:30 +01:00
Iamgoofball
4735e1c02a Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs 2015-02-23 18:47:21 -08:00
hornygranny
b49a5a934c Merge pull request #7918 from paprka/weldingshitty 
Fixes welding tools using fuel when switched on
 2015-02-23 15:52:25 -08:00
Razharas
e889ee7a42 Merge pull request #7700 from RemieRichards/ExplosionsAndEmbedding 
Items Embedding in Limbs
 2015-02-24 01:22:01 +03:00
phil235
996d684458 Fix applying gauze on already bandaged and non bleeding person, the operation is now canceled and it only gives the appropriate message. 2015-02-23 14:23:25 +01:00
hornygranny
82a7beb02c Merge pull request #7888 from xxalpha/crayonruntimes 
Add initialize for crayons and fix runtime error.
 2015-02-22 20:19:55 -08:00
hornygranny
c0c8a739e2 Merge pull request #7721 from paprka/miening 
Mining & mine-related chem changes
 2015-02-22 20:17:24 -08:00
Mandurrrh
e03d98786b Fixes #7910 and #7909 clown related bugs. 2015-02-22 20:53:39 -05:00
Mandurrrh
da9100893f adds drone access 2015-02-22 18:23:08 -05:00
Mandurrrh
56912c69ba Removes help intent block giving silicons freeacess. Everyone else has to walk still. 2015-02-22 17:53:52 -05:00
paprka
8c1af4da25 welder fuel usage on switch 2015-02-22 14:15:04 -08:00
phil235
bd870d649c Adds new plants to botany (rice, oat, blue cherries, holy melon, parsnip, geranium, lily, snap corn, blumpkin, mimana, sweet potato, vanilla, red beet) and adding two new reagents (vanilla and rice). 2015-02-22 22:10:25 +01:00
Mandurrrh
97d82b15c2 Fixes #7883 Borgs can't pass through holotape 2015-02-22 09:15:42 -05:00
xxalpha
cf05a587f9 Code tweak. 2015-02-22 13:58:15 +00:00
Swag McYolosteinen
1035d95f90 Merge pull request #7716 from paprka/megaphoney 
Adds megaphones
 2015-02-22 12:58:49 +01:00
paprka
d8e3f7f28a fixes usr.stat 2015-02-22 03:37:02 -08:00
xxalpha
f2a27ade31 Add initialize for crayons and fix runtime error. 2015-02-22 02:49:56 +00:00
Iamgoofball
167f4ef0ee Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs 2015-02-21 14:14:50 -08:00
phil235
68942e1ace Merge pull request #7686 from xxalpha/newgraffiti 
New graffiti.
 2015-02-21 12:46:45 +01:00
Iamgoofball
a0d831a120 rip bacon 2015-02-20 22:10:02 -08:00
Iamgoofball
e24e94544e Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs 
Conflicts:
	code/modules/food&drinks/food/snacks_meat.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
	icons/obj/drinks.dmi
	icons/obj/food.dmi
 2015-02-20 22:00:53 -08:00
Razharas
55208e408d Merge pull request #7419 from paprka/beltoveray 
adds a simple overlay system for belts
 2015-02-20 07:06:20 +03:00
Remie Richards
42fe551665 Merge branch 'master' of https://github.com/tgstation/-tg-station into ExplosionsAndEmbedding 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-02-19 18:16:33 +00:00
phil235
66720a5ce9 Merge pull request #7834 from Menshin/telexploit_fix 
Deactivates the Hidden Syndicate Teleportation Device
 2015-02-19 16:39:49 +01:00
Menshin
0d0ef9e02a Deactivates the Hidden Syndicate Teleportation Device 2015-02-19 16:34:49 +01: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