cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-01 12:31:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,945 Commits 60 Branches 14 Tags
ef41ccf5daeb75a270253d5559cdcd4383b9c7b6
Commit Graph

2021 Commits

Author SHA1 Message Date
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
Cheridan
ad6fa779b5 Merge pull request #1446 from Ricotez/airlockpainterfixes 
Fixes and improvements to airlock painters.
 2013-09-30 19:15:30 -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
Cheridan
566e1cc166 Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/1415 
Conflicts:
	tgstation.dme
 2013-09-23 11:04:33 -05:00
Aranclanos
f887f57511 Merge pull request #1412 from Rolan7/RainbowSwords 
Rainbow swords
 2013-09-23 01:36:10 -07:00
Malkevin
c9d26c99f9 Removed the black mask, it really did look too much like a gimp mask. 
Color scheme is now: HoS Red/Blue, Warden Red only, Officers White

Recolored the blue mask, should look much better now:
https://dl.dropboxusercontent.com/u/95696802/Commits/secmask/newblue.png

Moved the ..() in the departmental lockers after the departmental equipment so that they're at the bottom of the pile instead of on top, which was annoying
 2013-09-21 23:49:42 +01:00
KazeEspada
38d7374bc2 Makes circuits into type paths. Dna modifiers had a bad string that showed up when converted into a type path. Power monitors are now actually computers. Makes smashing computers red. 2013-09-21 14:41:50 -07:00
Cael_Aislinn
772acc95c4 mobs on fire system, by ergovisavi 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-09-22 04:59:48 +10:00
Cheridan
bac1d6e942 Merge pull request #1390 from Petethegoat/eventzzzzz 
Eventzzzzz
 2013-09-21 10:25:54 -07:00
Cheridan
5c2b2865e0 Merge pull request #1410 from Petethegoat/fixes 
Issue fixes
 2013-09-21 10:10:09 -07:00
Robson Richards
4995b64c18 Moves the plasteel/cyborg into plasteel.dm, works the same, Convenience 2013-09-21 17:27:39 +01:00
Robson Richards
6dba8dec10 Gives Engiborgs Floortiles 
Rechargestation is set to replenish them aswell
 2013-09-21 15:51:19 +01:00
Malkevin
86f843ad60 Merge branch 'master' of https://github.com/tgstation/-tg-station into radcollectors 2013-09-21 11:51:41 +01:00
Fleure
760589cd35 Janitor PDA now locates the cart, removes old bucket locator 2013-09-21 01:21:13 +01:00
Cheridan
cb3de0d038 Merge pull request #1371 from Malkevin/sechailer 
Sechailer mask (now finished)
 2013-09-20 13:47:12 -07:00
Rolan7
04fbcb4104 It's now hacking via multitool instead of emagging via emag... maybe people will actually do this (: 2013-09-20 13:12:30 -04:00
Rolan7
6dcd952be9 Removed optional use of .src for Aranclanos 2013-09-20 11:06:36 -04:00
Cheridan
1939098175 Fixes lights on anomalies, reverts my accidental change to device.dmi 2013-09-20 00:44:12 -05:00
Cheridan
d19e7f6493 Converts bluespace events into the anomaly system. Adds some sprites and polishes up some effects 
Next up: Moving all of the anomalies into an event subtype to cut down on copied code!
 2013-09-19 22:08:04 -05:00
Rolan7
d2d664a193 Used Aranclanos's code for combining swords without dropping both hands! Re-added the icons to the fresh DMIs. Self-testing found no issues, this is ready for someone to approve. 2013-09-19 18:49:32 -04:00
Malkevin
ce0828c600 Radiation Collector analyzing 
Checking a collector's last power output via analyzers has been moved to multitools, because that actually made sense (betcha didn't know this existed, I know I didn't)

Analyzers can now be used to check the gas level of the tank in a loaded radiation collector (yay no more crowbars)
You can also use them on pipes to check gas levels (yay no more pipe meters)

Codewise, the several inconsistant instances of the analyzer code have been moved to a single proc. The following have been converted to use this:
-Pipes (they didn't have this before. Also changed the attackby code to be less dumb...)
-Pipe tanks (you know those big ones in maint everyone forgets about)
-Portable Atmospherics (canisters, air pumps, scrubbers)
-Flamethrower
-Tanks
-And now collectors
 2013-09-19 22:15:11 +01:00
Rolan7
46b2b122c2 Should bring admins.txt in line with tgstation upstream, and the icon files match the upstream ones too. The icon files do still need to be edited, of course. 2013-09-19 15:46:35 -04:00
Rolan7
7b9e32c0da Merge branch 'master' of https://github.com/tgstation/-tg-station into RainbowSwords 
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
	config/admins.txt
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2013-09-19 14:31:05 -04:00
Pete Goodfellow
26088805b8 Fixes #121. 2013-09-19 15:54:02 +01:00
Cheridan
580294685b Merge branch 'master' of https://github.com/tgstation/-tg-station 2013-09-19 03:22:20 -05:00
Cheridan
115faf4954 Anomaly Neutralization 
Anomalies can now be scanned to determine their frequency, and neutralized by sending a signal on that frequency.
 2013-09-19 03:20:44 -05:00