cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-14 10:53:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,942 Commits 62 Branches 14 Tags
73d4b247a2b2e6f00d6ed16a98eac36dcb60cdff
Commit Graph

6319 Commits

Author SHA1 Message Date
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
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
35d73f1986 Merge pull request #1475 from ACCount12/sparky 
Sparks!
 2013-10-03 18:56:25 -07:00
AndroidSFV
52c896103c Removes unnecessary commented stuff 2013-10-01 23:55:36 -05:00
AndroidSFV
93497b4c3f Expansion of AI Photography. AI can now target which turf is the center of the picture taken. Other fixes included. 2013-10-01 23:10:38 -05:00
Aranclanos
8951df41c7 Merge pull request #1449 from Miauw62/xenofix 
Fixed various xeno issues.
 2013-10-01 05:18:44 -07: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
Cheridan
9c462d1b3a Merge pull request #1457 from fleure/clownshoes 
Fixes target names not being updated on change, reduces some duplicated ...
 2013-09-29 11:16:08 -07:00
Miauw
cf081cdef7 More removing of emote limiter 2013-09-29 18:16:20 +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
Pete Goodfellow
7d62637f91 Merge pull request #1477 from VistaPOWA/bloodiestest_trails 
Adds new blood trail sprites (now mergeable)
 2013-09-29 08:22:57 -07:00
Miauw
3d0653ac30 Removed xeno emote limiter 2013-09-29 15:57:30 +02:00
VistaPOWA
0a19a0739f Adds new blood trail sprites 
Adds validsalad's blood trail sprites and gives the trails a bit more
variety.

Matches the blood's hue with the trail's hue.

Fixes rare runtime error regarding blood trails.
 2013-09-29 12:40:57 +02:00
ACCount12
110e0f420a Sparks! 2013-09-29 21:25:38 +13:00
ACCount12
78e91a59c1 Sparks! 2013-09-29 21:23:13 +13:00
Aranclanos
a7a9a27ffb Merge pull request #1460 from Giacomand/nobreathe 
Blob Spore Clouds
 2013-09-28 17:19:44 -07:00
Aranclanos
05e894751a Merge pull request #1413 from JJRcop/nar-sie-red-alert-fix 
Fixes corner-case exploit regarding nar-sie and red alert
 2013-09-28 15:47:15 -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
Fleure
0e5bd024f4 Modified real name update check slightly 2013-09-27 20:58:45 +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
Fleure
1cd02ac34c Fixes target names not being updated on change, reduces some duplicated code 2013-09-26 20:16:00 +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
Cheridan
294f2a20d7 Merge pull request #1440 from dumpdavidson/gamemode_setup 
malf. AI + blob fix
 2013-09-25 22:48:08 -07:00
Cheridan
90c4eeaf1a Merge pull request #1443 from Giacomand/nobreathe 
Removed an unnecessary sleep() in the MC.
 2013-09-25 22:41:07 -07:00
Cheridan
8cd5b41c7c Merge pull request #1429 from Jordie0608/DirtyGrille 
No more dirt beneath windows
 2013-09-25 22:27:02 -07:00
Cheridan
c4402c7bd9 Merge pull request #1427 from Miauw62/doors 
Made door crushing better. Ready to merge.
 2013-09-25 22:16:43 -07:00
Cheridan
a80d99cd76 Merge pull request #1445 from Neerti/9-24-2013_flowers_in_hair 
Wear flowers in your hair!
 2013-09-25 22:06:08 -07:00
Cheridan
4c43756c96 Merge pull request #1433 from fleure/lemonlime 
Lemon-Lime added to vending machines
 2013-09-25 21:48:52 -07:00
Ricotez
bf58d406a5 Merge pull request #1450 from Incoming5643/wizardspells2 
Quickened Spells (ready to merge edition)
 2013-09-25 16:01:26 -07:00
Pete Goodfellow
18eb119ae2 Merge pull request #1415 from Cheridan/ProjectStormchaser 
"Anomaly" Events!
 2013-09-25 10:53:21 -07:00
JJRcop
2524cc00c1 Fixes corner-case exploit regarding nar-sie and red alert 
Changes the time the shuttle comes with a nar-sie to 3 minutes, as Centcom
is probably rushing anyway because there is a giant unidentified god
running around the station.
 2013-09-25 12:22:49 -04:00
Miauw
543126911b Fixed simple hunter sprites, too. 2013-09-25 18:13:20 +02:00
Miauw
1f50a508eb Alien *roar and *deathgasp sounds are no longer spammable. 2013-09-25 17:45:51 +02:00
Miauw
a7cc370c78 Simple_animals won't die every time they're hit after death anymore. 
Dead simple xenos use correct sprites.
 2013-09-25 17:08:00 +02: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
KazeEspada
25713b57c5 Fixes the last few issues with the computer update. 2013-09-24 13:54:02 -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
Neerti
08b0ae165c Adds the ability to place five different kinds of flowers on your head, each with their own new mob sprite. 2013-09-24 14:26:26 -04: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