cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 05:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,708 Commits 61 Branches 14 Tags
4e2c97bf3f23fd979ccbad8e0fc2ef774dd63ae4
Commit Graph

2156 Commits

Author SHA1 Message Date
Aranclanos
3fed8dd8f6 Merge branch 'Cybernetic-limbs' of https://github.com/RobRichards1997/-tg-station into Cybernetic-limbs 
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
 2013-11-26 22:03:26 -03:00
Giacomand
852e5deb44 Merge branch 'master' of https://github.com/tgstation/-tg-station into camera_bug_sprite 
Resolved Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2013-11-26 21:33:07 +00:00
Giacom
b0641be44d Merge pull request #1833 from kyrahabattoir/ItemNameFixingRound2 
Item name fixing round2
 2013-11-26 12:02:26 -08:00
Aranclanos
4a4658bc93 Merge pull request #1808 from RobRichards1997/17/11/2013-Turret_Runtime_Fix 
Fixes Turret/Atom Moveable Explosion Runtime [BUGFIX]
 2013-11-24 22:55:24 -08:00
Giacom
d7b6001f98 Merge pull request #1835 from Cheridan/NukePR 
Scale Ops 1.1
 2013-11-24 13:51:07 -08:00
Cheridan
2edbd69ce3 what is even the difference between w_class 1 and 2 anyway geez 2013-11-24 14:35:12 -06:00
Robson Richards
75ff8338b8 Fixes bible spam 
Fixes "r_arm" nonsense
Fixes appendicitis carrying over to robotic chest
 2013-11-24 15:24:55 +00:00
Cheridan
df9bc262bf Merge pull request #1798 from kyrahabattoir/vending-reloadedB 
Vending reloaded!
 2013-11-23 11:40:34 -08:00
Cheridan
865fad0d0b Merge pull request #1841 from Giacom/sound_pro 
Fixes certain objects not using 3D sounds.
 2013-11-23 10:33:03 -08:00
Giacomand
3e3e193c79 Camera bug sprites from Rob 2013-11-23 17:10:43 +00:00
Aranclanos
0ec59be055 Adrenalin implants will now actually add their reagents instead of runtime and cry. 2013-11-22 01:47:18 -03:00
Giacomand
17fd5d6cdc * Fixes certain objects not using 3D sounds. 
* Gave the piano a bigger falloff.
 * Capped the sound x/z to 7.
 2013-11-21 23:50:53 +00:00
Cheridan
d814414227 Scale Ops 1.1 
Reduces the costs of some items based on feedback.
Op lockers now start with a new miniaturized jetpack.
 2013-11-20 17:59:02 -06:00
Aranclanos
ab566551af Merge pull request #1789 from havocx42/WindowPush 
Attacking unanchored windows with a wrench turns them into stacks of glass
 2013-11-20 11:19:16 -08:00
Kyrah Abattoir
225a906eda code/game/objects/items/* (root) lowercase pass 
code/game/objects/items/devices/* lowercase pass
 2013-11-20 19:15:00 +01:00
Kyrah Abattoir
109c1065c7 code/game/objects/effects/* lowercase pass 
NOTE: created a baseclass for /obj/effect/decal/remains/*
 2013-11-20 18:03:41 +01:00
havocx42
a4e71ce1c0 Removed ..() from Del proc 2013-11-20 09:02:37 +00:00
Cheridan
bae3bcff3b Merge pull request #1801 from Giacom/explosion_sound 
3D Sounds + Rewrote the explosion sound to be more optimized and to be more dynamic.
 2013-11-19 15:49:45 -08:00
Giacomand
62051364ef Changed the heavy impact multiplier to 20. 2013-11-19 21:35:36 +00:00
Laurence Reading
92c0f666f7 When removing a window the Deconstruct sound is played instead of shatter 
Adds the ..() call to del()
 2013-11-19 13:15:54 +00:00
Kyrah Abattoir
e6ee419f47 ADDED costume restocking unit 
REMOVED many useless comments
ADDED invoke vending_refill consutructor superclass

ADDED: Cargo can order the autodrobe supply crate
 2013-11-18 19:15:23 +01:00
Giacomand
c012a7aee3 Changed playsound() to use less code. Playsound now loops through the player list, which means you do not have to check inside closets/objects/other mobs to play sounds. 
Made all sounds use 3D sounds! This includes sounds which have less volume the further away you are from it.
The piano now uses 3D sounds.
Changed how the far explosion sound is calculated.
 2013-11-18 14:38:49 +00:00
Kyrah Abattoir
6042dbe667 Merge branch 'master' into vending-reloadedB 2013-11-18 15:06:08 +01:00
Aranclanos
de227487a8 Merge pull request #1792 from Giacom/PDA_tweak 
AIs can no longer intercept messages randomly. Captain PDA no longer starts off.
 2013-11-17 22:34:03 -08:00
Giacom
fc1211f1b4 Merge pull request #1803 from kyrahabattoir/examine-cleaning 
Examine cleaning
 2013-11-17 13:12:09 -08:00
Giacom
583cdb1781 Merge pull request #1763 from fleure/medmech 
Fixed some container escape issues
 2013-11-17 13:10:53 -08:00
Robson Richards
e71ea3289e Merge branch 'master' of https://github.com/tgstation/-tg-station into 13/10/2013-Limb/organ-stuff 
This probably broke everything... :(
 2013-11-17 18:09:14 +00:00
Kyrah Abattoir
4b002b2e7a Fixed some snowflakes in the examine grenade code and redundancies in their descriptions. 2013-11-17 14:59:48 +01:00
Robson Richards
5685c9ed6e Removes old method instead of commenting it out 2013-11-17 12:14:21 +00:00
Robson Richards
ea3b035e5b Fixes the issue in explosion.dm 2013-11-17 12:03:05 +00:00
Kyrah Abattoir
560b50ec1b Reformatted the way objects and items structure their description text, added the little object "icon" everyone seems to be using. 
Added superclass invoke for the arcane tome

Added superclass invoke to light switches, removed it's (unused) description.

FLightswitch description repetition derp

examine superclass invoke for gas flow meter, space heater, fire extinguishers, grenades/IEDs, fancy boxes and welder. Changed description for welder and fire extinguisher to show their content in a similar style.

Fixed tank, linen bins and janicart description, and added welder of previous commit (forgot to commit it)

REMOVED icon in mop_bucket description (now provided by item class).
REMOVED unused examine() override in clothing/gloves
REMOVED custom examine() for glass/rag
CHANGED using examine superclass on paperwork/paperbin, removed redundant description code
CHANGED examine superclass for power/apc
ADDED universal maxcharge readout for all the powercell types.
CHANGED using examine superclass on machinery/light, removed redundant description code

FIXED weapon/virusdish use a description field.
TWEAK lowercased some of the portable generators.

Fixed improperness of pacman names
 2013-11-16 22:15:50 +01:00
Fleure
ecc10f6aea Refactored big package attack code 2013-11-16 20:56:23 +00:00
Giacomand
261314d23d * Rewrote the explosion sound to be more optimized and to be more dynamic. 
Explosions that are close to you play the usual sound.
Explosions which are far away will play explosionfar.ogg but with volume differences depending on the distance.
Max cap bombs will play explosionfar.ogg for half of the station (140 tiles).
Explosion sounds will have panning, so stereo users will be able to tell the direction that the sound came from.
Small bombs will play much less than max cap bombs, and be quieter.
 2013-11-16 19:27:10 +00:00
Robson Richards
637c3f7f63 Fixes for @Aranclanos 
Diseases now have a requires and a required_limb variable
if requires is 1 then it will run a check for required_limb (WHICH USES TYPEPATHS)

Reverts a turret change that git through into the pull for some reason

added some feedback messages in certain places

removed the hulk-like snowflake check that was really crappy anyways

Reworked a part of surgery/surgery_step.dm to use a switch
 2013-11-16 18:13:41 +00:00
Kyrah Abattoir
94497eed78 Corrected typos and cleaned out description 2013-11-16 12:57:16 +01:00
Kyrah Abattoir
86a75bba95 Fixed paths for icons. 2013-11-16 12:01:29 +01:00
Kyrah Abattoir
40f17ebaf2 More code, vending machines cannot dispense while they are unscrewed. (might remove that) 
Only the dmi files are missing now.
 2013-11-15 20:26:39 +01:00
Giacomand
6b68a7245d * AIs can no longer intercept messages randomly. Instead they can use the Message Monitor by getting their cyborg to get the keypass. 
* The Captain's PDA no longer starts off, instead their PDA is detonation proof.
 2013-11-15 14:17:53 +00:00
Kyrah Abattoir
e11b05416b New system based on restocking points rather than fixed inventory. 2013-11-15 01:04:32 +01:00
havocx42
be44497a09 removing unnecessary "/" from variant declaration 2013-11-14 22:54:23 +00:00
Laurence Reading
d753d524c2 Attacking unanchored windows truns them into stacks of glass 2013-11-14 22:17:01 +00:00
Kyrah Abattoir
b6cceb8ac7 vending system that use granular stock boxes 2013-11-14 21:57:36 +01:00
Fleure
05d5933137 Fixed being able to escape moving lockers 2013-11-14 18:42:13 +00:00
fleure
364992496b Fixed nozzle not filling from sink. 2013-11-12 00:02:29 +00:00
fleure
c860235a51 Added watertank backpack and put on map 2013-11-11 19:08:37 +00:00
Cheridan
b2b9aea469 Merge pull request #1733 from JJRcop/borg-decon-dumb 
Adds instructions to deconstruct cyborgs into Cyborgs for Dummies
 2013-11-10 13:39:31 -08:00
Robson Richards
6587fe30cd Fixes an earlier attempt at the previous commit 
Fixes a comment that was a DIRTY LIAR
 2013-11-10 02:04:00 +00:00
Robson Richards
b2b6a9ff84 Fixes Chem healing and Chem damaging of Robotic limbs 
Hey @Cheridan NO ISTYPES! :D
Ugh.. I mean "Removes" 10 totally unnecessary istypes
Fixes the healing of robotic limbs so that the message actually doesn't display now.

Credit to ACCount12 for digging around and finding some nifty code
that my brain never thought of
 2013-11-10 01:55:40 +00:00
Giacomand
f7e662e883 Merge branch 'master' of https://github.com/tgstation/-tg-station into tele_sci_change 
Resolved Conflicts:
	code/__HELPERS/game.dm
 2013-11-09 18:43:55 +00:00
Aranclanos
2295080ea3 Merge branch 'medmech' of https://github.com/fleure/-tg-station into medmech 
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
 2013-11-09 15:14:48 -03:00