cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 00:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,907 Commits 61 Branches 14 Tags
40e093de501da07d795d7cd505c6ff85ae153cfd
Commit Graph

12006 Commits

Author SHA1 Message Date
Ergovisavi
40e093de50 Merge branch 'master' of https://github.com/tgstation/-tg-station into firefighting 2014-11-04 10:52:46 -08:00
Ergovisavi
46a3170b2a Firefighting changes: 
-Firesuit level protection will not entirely protect you from being set on fire. You will gain small amounts of heat while on fire.
-Overhauls the Atmos Water Backpack into a more effective firefighting tool
-Adds a secure ATMOS closet containing said atmos water backpack to the code, but is not on the map as the backpack already exists in the ATMOS hardsuit object at this moment
 2014-11-03 10:25:12 -08:00
Cheridan
2fefe79c1f Merge pull request #5599 from phil235/CharScreenWindowFix 
Fix the character setup window's size
 2014-11-03 10:39:32 -06:00
Cheridan
5d7993eb75 Merge pull request #5602 from tkdrg/ihavenohandstopullyouwith 
Slimes can no longer pull
 2014-11-03 10:19:27 -06:00
Cheridan
3239c6dbfc Merge pull request #5283 from TZK13/Syndicate-Encryption-Key 
Adds a Syndicate encryption key to uplinks
 2014-11-03 10:02:28 -06:00
Cheridan
a28abaf72a Merge pull request #5544 from MrPerson/jesus_shut_up_aran_god_damn 
Make buckled mobs anchored if their chair is anchored
 2014-11-02 22:40:20 -06:00
Cheridan
594adac2e5 Merge pull request #5549 from Menshin/medical_apparels_fixes 
Medbay/Genetics machinery fixes
 2014-11-02 21:48:46 -06:00
Cheridan
cf5df74a27 Merge pull request #5540 from phil235/botRepairFix1 
adding CoolDown to welding repair on bot/borg/mecha
 2014-11-02 12:12:19 -06:00
Cheridan
6e29ad75d5 Merge pull request #5492 from tkdrg/nofunallowed 
You can no longer put transit tube pods in a station that already has one
 2014-11-02 11:56:20 -06:00
Cheridan
51eae4c5a2 Merge pull request #5601 from phil235/ObjVerbCheckFix 
Adding checks for stun, restrained to many object verbs.
 2014-11-02 11:34:48 -06:00
Cheridan
71fe1bf00b Merge pull request #5597 from phil235/IdMsgFix 
Fix the 'show ID' message.
 2014-11-02 11:10:16 -06:00
Cheridan
4f58312d76 Merge pull request #5596 from phil235/LipstickFix 
Fix for #5588
 2014-11-02 10:39:21 -06:00
Cheridan
ef29aaef57 Merge pull request #5598 from phil235/PDAsoundFix 
Fix lack of sound when non-silent PDA receives a message.
 2014-11-02 10:26:28 -06:00
Cheridan
13c155c5ad Merge pull request #5546 from Perakp/saltAndPepper 
Fixes sneaky pepper mill feeding
 2014-11-02 09:50:30 -06:00
Cheridan
852d54df78 Merge pull request #5495 from phil235/ReagentSplashFix 
You can no longer splash more than one turf/obj with a beaker/bucket by clicking quickly.
 2014-11-02 09:33:48 -06:00
Cheridan
fc86499996 Merge pull request #5579 from wiox/P1 
Throwing items in to disposal bins updates the icon
 2014-11-02 09:31:09 -06:00
Cheridan
d35fbd3ec0 Merge pull request #5555 from rosenmann/food_reassigning 
Reassigned snacks and recipies to more specific categories
 2014-11-02 09:22:56 -06:00
Cheridan
829b5a800a Merge pull request #5582 from tkdrg/thiswentbetterthanexpected 
Floor refactor hotfixes
 2014-11-02 09:17:11 -06:00
MrPerson
05b2146a7d Fix anchored issues with alien nests 
Because standardization is poison it seems
Also fix an issue where pixel_y could get permanently set to 6.
 2014-11-02 05:46:03 -08:00
Cheridan
47c2e9339b Merge pull request #5567 from MrPerson/my_little_droney 
Hopefully fixes that runtime where drones could wind up in nullspace.
 2014-11-01 22:39:17 -05:00
Menshin
73e642762f * Prevent being able to open/close sleepers, cryo tubes and DNA scanners when in various conditions (weaken, ...) and by non-humans/non-silicons. 
* Fixes possibles infinite loops runtime (#5527)

* Added icon updating on power changes/maintenance to Cryo Tubes and DNA Scanners
* Unpowered DNA Scanners can no longer be used if the associated computer is powered

* Cryo cells and sleepers won't work when powerless anymore

* Added an "is_operational" proc to machinery instead of duplicating the same check over and over.
* Cloning pods and DNA Scanners used by cloning computers won't work if powerless/broken/maintenance anymore.

Added an unpowered sprite for DNA Scanners, courtesy of Nienhaus
 2014-11-01 21:52:54 +01:00
tkdrg
7ab17964d6 Slimes can no longer pull. 2014-11-01 16:15:42 -03:00
phil235
128c9222e5 Adding checks for stun, restrained to many object verbs. 
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
 2014-11-01 19:18:01 +01:00
phil235
e00feb8f1f Fix the character setup window's size 2014-11-01 16:18:23 +01:00
phil235
4803f099f6 Fix lack of sound when non-silent PDA receive message. 2014-11-01 15:32:48 +01:00
phil235
c8f3ad2dd0 Fix ID show message. 
Remove "Read ID card" object verb (because all the information it gave was already in the ID card's name.
Remove some old text( ) stuff.
 2014-11-01 15:17:43 +01:00
phil235
af767f2935 Fix being able to apply lipstick through masks and items covering the mouth. 2014-11-01 13:28:32 +01:00
Remie Richards
7a3378935a Merge pull request #5503 from tkdrg/blowme 
Improves robotics control console feedback for admins and the AI
 2014-11-01 03:56:12 +00:00
Remie Richards
0bc683aa29 Merge pull request #5457 from GunHog/AI_Radio 
Adds AI Integrated Radio
 2014-11-01 03:44:44 +00:00
Remie Richards
3d3521654f Merge pull request #5497 from tkdrg/dingdongbannudesu 
Assistant jobbans now ban people from using "Be assistant"
 2014-11-01 03:42:50 +00:00
Remie Richards
85c2b72cfe Merge pull request #5482 from Menshin/maploader_rewrite 
Maploader rewriting
 2014-11-01 03:41:39 +00:00
Cheridan
f948d3038c Merge pull request #5539 from phil235/Icecreamvat 
Icecream vat fix
 2014-10-31 18:44:39 -05:00
Remie Richards
24b6e9c601 Merge pull request #5506 from hornygranny/OOPgularity2 
makes the singularity's pulling OOP and insanely deadly
 2014-10-31 23:13:11 +00:00
tkdrg
a21fe59234 Floor refactor: Fixes a bug where adding a floor tile to lattice created a covered tile. Fixes burnt_states runtime. 2014-10-31 20:09:50 -03:00
William Wallace
5fbb445168 Throwing items in to disposal bins updates the icon 
This fixes #5504
 2014-10-31 20:04:05 +00:00
Menshin
5037e880d8 Fix the lag produces by oversized Pumpkings bounds interacting with space transitions. 
Reduced the number of meteors to 10 waves of 3 over 40 seconds.
 2014-10-31 19:48:55 +01:00
Cheridan
30ce18e775 Merge pull request #5575 from Menshin/infinibig/splosion_hotfix 
Meteors infinigib/infinisplosion fixes
 2014-10-31 10:29:28 -05:00
Cheridan
e2089d88e9 Merge pull request #5483 from Menshin/away_missions_camera_support 
Allows cameras networks on away missions
 2014-10-31 10:04:51 -05:00
Cheridan
c8b5f99cf4 Merge pull request #5505 from phil235/AtkMsgFix1 
/item/weapon with force 0 can no longer knock humans down
 2014-10-31 10:02:19 -05:00
Cheridan
9bb612bd79 Merge pull request #5521 from xxalpha/horrorshoes 
Bananium powered clown shoes
 2014-10-31 09:52:56 -05:00
Menshin
a26a05450f Fixed meteors not properly qdel'ing (fixing infinigibs or infinisplotions) and variables initialization. 
Admin-spawned meteors should not instaqdel anymore (fixes #5226)
 2014-10-31 13:55:40 +01:00
Cheridan
7b0e20a634 Merge pull request #5543 from MrPerson/hotfixes_for_the_hotfix_god 
Hotfix for diagonal drifting
 2014-10-31 07:22:28 -05:00
Miauw
0cadefd855 Nothing to see here, continue with your planned spooking, citizens. 2014-10-31 21:52:10 +01:00
Hornygranny
6b253ef99a engine room floors 2014-10-30 19:43:20 -07:00
Hornygranny
84e13b2f0e uses builtin_tile to avoid new() 2014-10-30 18:35:47 -07:00
Hornygranny
9c95842adf Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2 
Conflicts:
	code/game/turfs/simulated/floor.dm
 2014-10-30 17:26:25 -07:00
hornygranny
73b83ddef6 Merge pull request #5357 from tkdrg/attackoftheturfs 
Floor refactor
 2014-10-30 17:23:20 -07:00
tkdrg
0bb462e857 Fixes botcall conflicts, removes even more cruft and unused code 2014-10-30 20:36:30 -03:00
MrPerson
00cf1a4f50 Hopefully fixes that runtime where drones could wind up in nullspace. 2014-10-30 15:52:24 -07:00
tkdrg
9526b8804b Merge remote-tracking branch 'upstream/master' into attackoftheturfs 2014-10-30 19:35:03 -03:00