cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-13 02:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,072 Commits 62 Branches 14 Tags
e82a06fc68a8af00a8b6d919bf8dfef7bafc8d9d
Commit Graph

2044 Commits

Author SHA1 Message Date
Giacom
618b41ea08 Merge pull request #1549 from Atskadan/grammarfix 
Fixes several errors in the cap gun's text
 2013-10-11 07:30:17 -07:00
MrPerson
38fe6d7a02 Merge pull request #1542 from Giacomand/remove_radio_icon 
Removed the radio icon from radio chat.
 2013-10-10 15:31:07 -07:00
Atskadan
b9b5f3fbcd Changes \a to the, since the game never says anything like "you fire A laser gun", etc 
consistency
 2013-10-10 17:06:43 -05:00
Giacomand
3b958ebb54 Merge pull request #1500 from AstralSerpent/master 
Crayons can now be grinded down for coloured crayon powder, which can be...
 2013-10-10 11:59:54 -07:00
Atskadan
3c901165ae Changes "cap gun" in the firing message to [src], so if the gun is renamed, it will retain that name. 2013-10-10 00:47:06 -05:00
Atskadan
a59122ed0d Fixes several errors in the cap gun's text, including every instance of "capss" and a sentence that used "is" instead of "are". 2013-10-09 23:54:23 -05:00
Giacomand
838b1167ba * Removed the radio icon from radio chat. 2013-10-09 20:14:14 +01:00
Mloc-Argent
db0a908038 Make energy weapons not get a bloody overlay and fixed alt-gr not calling AltClick() 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 20:15:56 +01:00
Mloc-Argent
9de132a0a3 Small fixes and a new atom flag. 
* Fixes the ( shaped cyan wire
* Fixes a luminosity bug with glowshrooms.
* Changes a ridiculous internal loop in intercoms to use the MC.
* Makes intercoms not be bloodied by bloody hands.
* Adds a "NOBLOODY" flag for atoms that don't want to be bloodied.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 20:15:55 +01:00
Giacomand
796f3ca9f1 Merge pull request #1517 from Mloc/tg-byond500 
[MAP] Refactors the code to work with BYOND 500.  Big commit.
 2013-10-07 07:05:46 -07:00
Aranclanos
d062009a6e Merge pull request #1507 from Giacomand/napalm 
Napalm works again, which fixes incendiary grenades.
 2013-10-06 17:01:46 -07:00
Aranclanos
f4972ee3a4 Merge pull request #1503 from Giacomand/lockersuffocation 
Fixes lockers suffocating you in 5 minutes. Fixes #1227
 2013-10-06 16:24:26 -07:00
Giacomand
acec04c001 Merge pull request #1483 from Ergovisavi/ied_fix 
Fixes issue #1418
 2013-10-06 16:02:48 -07:00
Giacomand
0c2c02e284 Merge pull request #1484 from VistaPOWA/explosive_dirt_cleaning 
Makes decals disappear after an explosion
 2013-10-06 15:48:45 -07:00
Mloc-Argent
79495f710a Refactors the code to work with BYOND 500. Big commit. 
Var changes:
* /obj/item/var/color is now item_color
* /obj/machinery/portable_atmospherics/canister/var/color is now canister_color
* /obj/machinery/atmospherics/var/color is now pipe_color
* /mob/living/simple_animal/mouse/var/color is now body_color
* /mob/living/simple_animal/chicken/var/color is now body_color

Proc changes:
* /obj/machinery/door/proc/animate() is now do_animate()
* /obj/machinery/transformer/proc/transform() is now do_transform()

Map changes are due to pipe instances being changed from color to pipe_color

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-06 19:47:30 +01:00
Giacomand
3b667227e5 * Made atmos_spawn_air() use flags. 
* Replaced "fire" with SPAWN_HEAT. You will have to use it in conjunction with SPAWN_TOXINS to spawn fire.
 * Added flags for HEAT, COLD, TOXINS, OXYGEN, CO2, NITROGEN, N2O, FUEL and AIR.
 2013-10-06 00:29:45 +01:00
Ergovisavi
cc2113212b Fixes an issue where toy dualsabers would reflect like actual dualsabers 2013-10-05 15:21:14 -07:00
AstralSerpent
6462332591 Added the ..() as lord Giacom requested. Added changes to grinder that giacom did. May as well let them piggyback on this commit and hope it somehow forces my gloriously bads crayon powder to be pulled. 2013-10-06 08:16:17 +11:00
AstralSerpent
73d4b247a2 Changes some stuff Giacom provided input on. Thanks Aranclanos and Kaze Espada for the help. 2013-10-06 07:21:19 +11:00
Giacomand
983010e58b * Fixes lockers suffocating you in 5 minutes. Fixes #1227 2013-10-05 20:20:09 +01:00
AstralSerpent
113d6c0193 Crayons can now be grinded down for coloured crayon powder, which can be used and combined to override reagent colours. 2013-10-05 17:23:17 +10:00
Cheridan
ad6fa779b5 Merge pull request #1446 from Ricotez/airlockpainterfixes 
Fixes and improvements to airlock painters.
 2013-09-30 19:15:30 -07:00
VistaPOWA
620cdb8566 Removes extra var from decals 
oops that wasn't meant to be included
 2013-09-30 22:32:42 +02:00
VistaPOWA
b5fff895ee Makes decals disappear after an explosion 
Fixes runes, dirt, blood, etc remaining and floating in space after an
explosion.
Gibs are excluded from this change.
 2013-09-30 20:19:41 +02:00
Ergovisavi
e473b76335 Fixes issue #1418 
Adds a range check for filling up IED'S.
 2013-09-29 18:43:09 -07:00
Ricotez
5bd1a5bde7 -The airlock painter now shows a message when initially used on an airlock and out of ink/toner cardridge. 
-Codewise the functionality of airlock_painter/use() was divided between two procs. Use() still works the same, but can_use() only checks if the painter can be used, without draining ink or playing sounds if it can.
 2013-09-30 01:38:31 +02:00
Ricotez
b012829467 -Fixed being able to open the paintjob selection window and just walking away to paint the airlock from a distance. 
-Fixed a few runtimes that could occur if the toner cardridge were removed while the paintjob selection window is still open.
-If you remove the toner cardridge from the airlock painter, it will now try to be put in your hand before falling to the ground.
 2013-09-29 17:40:41 +02:00
Aranclanos
a7a9a27ffb Merge pull request #1460 from Giacomand/nobreathe 
Blob Spore Clouds
 2013-09-28 17:19:44 -07:00
Aranclanos
4ba95ec038 Merge pull request #1425 from RobRichards1997/21/09/2013-Engiborg-Floortiles 
Gives Engiborgs Floortiles
 2013-09-28 15:43:58 -07:00
Aranclanos
c219c9e4ba Merge pull request #1405 from Incoming5643/toyAI 
Adds a toy AI to the arcade machine prize list
 2013-09-28 14:58:53 -07:00
Aranclanos
6d87e5a11d Merge pull request #1389 from KazeEspada/computers 
Cleans up computer code severely.
 2013-09-28 14:48:42 -07:00
Cael Aislinn
4ea0fe35b0 Merge pull request #1469 from Ergovisavi/ergo_mobs_on_fire 
Mobs on fire: The return: The reckoning
 2013-09-28 10:00:24 -07:00
Ergovisavi
3bd07c39de Swapped extinguishers back to their default value. We'll see how it plays out. 2013-09-28 09:49:53 -07:00
Giacomand
f5e3037e6d Merge branch 'master' of https://github.com/Giacomand/-tg-station into nobreathe 
Conflicts:
	code/game/objects/effects/effect_system.dm - Resolved.
 2013-09-28 01:07:20 +01:00
Giacomand
6731722bff Made blob spores a bit more useful! On death they will release a spore cloud which will slightly (0.5 per tick) damage people and cloud your vision until the effect wears off. 2013-09-27 10:24:58 +01:00
Incoming5643
705786b482 Cleaning up (2/2) 2013-09-26 12:50:37 -04:00
Incoming5643
9035fa97de Cleaning up (1/2) 2013-09-26 12:49:38 -04:00
Pete Goodfellow
18eb119ae2 Merge pull request #1415 from Cheridan/ProjectStormchaser 
"Anomaly" Events!
 2013-09-25 10:53:21 -07:00
Ricotez
09663b8507 -Removed an unnecessary typecast and duplicate function call from the airlock painter code. 2013-09-25 11:59:49 +02:00
KazeEspada
da5ff1aca6 Merge branch 'master' of https://github.com/tgstation/-tg-station into computers 2013-09-24 14:07:51 -07:00
Ricotez
2668f82633 -You can now remove the toner cardridge from an airlock painter by clicking on the painter in your hand. 
-You can now install a toner cardridge into an airlock painter by clicking on it with the toner.
 2013-09-24 22:33:32 +02:00
Ricotez
0882d41574 Fixes and improvements to airlock painters. 
-Airlock painter can now be used on finished airlocks to change their paintjob. Keep away from the Clown.
-Airlock painter description up to standards. It still shows the current ink level.
-Fixed a bug with painting airlock assemblies where painted glass airlocks deconstructed to assemblies reconstructed to airlocks would lose their glass status.
-Airlock painters now make a sound (effects/spray2.ogg) when used to paint an airlock.
 2013-09-24 21:31:39 +02:00
Robson Richards
50c5e7ee74 Cleans up the new cyborg floortile, Thanks for spotting it Aran! 2013-09-24 15:55:06 +01:00
Incoming5643
249ac94c59 Took the blink out of gift wrapper 2013-09-24 01:17:13 -04:00
Cheridan
2f7cdd3fde Merge pull request #1430 from Malkevin/sechailer 
Sec Hailer: Day 1 bug fixes
 2013-09-23 22:05:40 -07:00
Cheridan
87ed1a2e1f Merge pull request #1417 from fleure/janitor 
Janitor PDA now locates the cart, removes old bucket locator
 2013-09-23 21:17:41 -07:00
Malkevin
8f08a2e13f Updated the proc to allow it function on objects other than the target. 
Changed PDAs to use the proc
 2013-09-24 00:27:43 +01:00
Malkevin
08a8884b0c Merge branch 'master' of https://github.com/tgstation/-tg-station into radcollectors 2013-09-23 22:45:28 +01:00
KazeEspada
27bc778449 Merge branch 'master' of https://github.com/tgstation/-tg-station into computers 2013-09-23 13:37:00 -07:00
Incoming
75d9092940 Changes the cooldown on toys to use spawn 
Removes blink toys from the code. RIPiss
 2013-09-23 14:41:54 -04:00