cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-21 22:47:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,987 Commits 61 Branches 14 Tags
5d490fcdb4014fc8182a5778ee4dbcce570e0913
Commit Graph

3367 Commits

Author SHA1 Message Date
Giacomand
5d490fcdb4 Merge pull request #1498 from Khubajsn/jobOccupationRightClick 
Fix for my 'new' job preferences screen
 2013-10-06 15:53:40 -07:00
Giacomand
b4b0cfaf54 Merge pull request #1402 from Petethegoat/sayustat 
Ported and improved Sayu's awesome alt-click stat panel.
 2013-10-06 15:42:49 -07:00
Aranclanos
915663e90c Merge pull request #1407 from Rolan7/Issue1404-PlantBGone 
Fixes #1404 by changing how hydro trays can receive reagents.  Pretty much...
 2013-10-06 13:53:23 -07:00
Cheridan
e029c078ef Merge pull request #1478 from Miauw62/variousfixes 
Various Fixes
 2013-10-05 12:04:13 -07:00
khubajsn
249e77d775 Tweaked the [High] color to more match the original one (because I am too lazy to make it not include the font tag) 2013-10-05 00:12:40 +02:00
khubajsn
44bd0e3186 Removing debug. 2013-10-04 23:47:38 +02:00
khubajsn
900cb36a29 No longer assuming the targetted job level, it'll be forcibly set from now on. This should prevent any issues where a job cannot be switched either way (up/down). 2013-10-04 23:40:45 +02:00
Miauw
4adf4fa4e9 Improved APC fix: breaker can be toggled regardless of power, power can be set to off or auto when there's no power instead of only off. 2013-10-04 20:14:07 +02:00
Rolan7
55f8959e56 The trans_to proc for /datum/reagents/ now detects and accepts /datum/reagents/ as targets instead of just reagent_containers. Updated the hydroponics attack_by to use that new feature. Improved the microwave-cleaning to use amount_per_transfer_from_this. It does ignore other reagents, only using up space cleaner, because it really doesn't need to be complicated. 2013-10-04 00:27:30 -04:00
Cheridan
35d73f1986 Merge pull request #1475 from ACCount12/sparky 
Sparks!
 2013-10-03 18:56:25 -07:00
Rolan7
4a88f8c6d6 Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue1404-PlantBGone 2013-10-03 19:04:25 -04: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
Pete Goodfellow
65909d0a33 Merge branch 'master' of github.com:tgstation/-tg-station into sayustat 
Conflicts:
	code/modules/mob/mob_defines.dm
 2013-09-29 22:27:35 +01:00
Miauw
cf081cdef7 More removing of emote limiter 2013-09-29 18:16:20 +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
Miauw
67e7eb86bd You can no longer turn on depleted APCs for a split-second 2013-09-29 14:31:26 +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
Miauw
bf4a160967 Fixed constructs being damaged to negative health & added ectoplasm spawning to Die() 2013-09-28 18:46:57 +02:00
Miauw
492c79974d MMI's no longer magically transmute alien brains into normal brains. Cleaned up the code a bit. 2013-09-28 15:59:02 +02: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
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
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
KazeEspada
da5ff1aca6 Merge branch 'master' of https://github.com/tgstation/-tg-station into computers 2013-09-24 14:07:51 -07: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
Rolan7
f7d2711753 Returns 1 instead of adding (more) special cases to the afterattack functions for beakers and spray bottles. 2013-09-24 13:37:17 -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
a1d3680ca2 Merge pull request #1434 from fleure/coils 
Fixed cable coils disappearing when combined
 2013-09-23 20:59:27 -07:00
Cheridan
b184ca473b Merge pull request #1439 from SuperSayu/clickfix 
Clickfix
 2013-09-23 20:32:39 -07:00
Rolan7
2764694f31 Allowed solutions to be applied to empty trays, fixed more text and colors. 2013-09-23 22:26:46 -04: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
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
50fa6e2a00 Merge pull request #1394 from Iamgoofball/aicrewtaketwo 
- Added a "Show Crew Monitoring Console" Verb to the AI Commands section of the AI's Verbs.
 2013-09-22 23:40:03 -07:00