cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 04:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,604 Commits 61 Branches 14 Tags
f5ae59a046c3b02027f3021586bda49c643e4a96
Commit Graph

5586 Commits

Author SHA1 Message Date
Jordie
f5ae59a046 Merge pull request #10700 from Ergovisavi/more_fire 
Molotovs and a throw fix
 2015-07-25 20:05:05 +10:00
Jordie
15a36f1a4e Merge pull request #10666 from duncathan/fuck 
Restores RPD placement delay for disposals (#10645)
 2015-07-25 19:12:48 +10:00
Jordie
9b0b4e1aa4 Merge pull request #10710 from xxalpha/cablecoilbackpack 
Fixed storage not updating when joining cable coils.
 2015-07-25 19:12:26 +10:00
Jordie
cd280f9d9f Merge pull request #10779 from xxalpha/rw_agent 
Made Agent IDs rewrittable.
 2015-07-25 19:11:06 +10:00
Jordie
ad2d7e1d0f Merge pull request #10789 from kingofkosmos/reentercorpselink 
Clickable re-enter corpse links
 2015-07-25 19:10:06 +10:00
bgobandit
473c06d147 Merge branch 'master' of https://github.com/tgstation/-tg-station into catsandpugs 2015-07-24 17:45:03 -04:00
WJohn
ea2b7fa50a Merge pull request #10622 from Steelpoint/AyylienGun 
[SPRITE|MAP] Abductor Sprite and Animation Change
 2015-07-24 12:33:13 -04:00
bgobandit
0d9f7dcb4a Merge branch 'master' of https://github.com/tgstation/-tg-station into catsandpugs 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-07-24 11:58:52 -04:00
Aranclanos
941559822d Merge pull request #10785 from ojacobson/active-turfs-at-round-start 
Remove all the "active turfs at round start" warnings from Box
 2015-07-24 07:06:17 -03:00
Steelpoint
68b5dd2979 Merge branch 'master' of https://github.com/tgstation/-tg-station into AyylienGun 
Conflicts:
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/obj/guns/energy.dmi
 2015-07-24 16:59:21 +08:00
Cheridan
05e227073d Merge pull request #10782 from phil235/VendingCharges 
Mech & vending machine fixes
 2015-07-24 00:02:31 -05:00
Owen Jacobson
9aa5d615d0 Forcewalls and mimewalls now block atmos properly. 
They were blocking atmos before, I think? This makes the "active atmos tiles"
code at startup do the right thing, though.
 2015-07-23 23:36:50 -04:00
WJohn
1d48703c0e Merge pull request #10778 from bgobandit/babbysfirstcommitwhoawow 
Fixes some spelling errors and tweaks some fluff text.
 2015-07-23 19:45:47 -04:00
kingofkosmos
750e5d9b5e Changed span classes to include the re-entering link. 2015-07-23 18:58:15 +03:00
bgobandit
fcb081f0e1 (hopefully) fixes merge conflict, adds changelog entry 2015-07-23 11:22:49 -04:00
bgobandit
df836d0f73 Cats and pugs now respond when you pet them. Pugs and corgis are now under the same dog parent, and all dog code is moved to dog.dm (corgi.dm and pug.dm no longer exist). Updates pathing across all areas of code and on all included maps. Fixes a minor pet collar naming bug. 2015-07-23 10:49:06 -04:00
phil235
1ab69f9fda Readding loading chef food into snack vending mechines. 
Adding a mention about being able to load food into snack vending machines in the cook book.
Removing the power setting of the microwave. The microwave upgrades makes it unneeded.
 2015-07-23 16:06:03 +02:00
Jordie
b2948fcab7 Merge pull request #10659 from phil235/HandcuffOverlayFix 
Handcuff, fire, overlays_standing fixes
 2015-07-23 22:21:52 +10:00
kingofkosmos
0095637eee Clickable link added to all re-enter corpse messages. 2015-07-23 10:50:45 +03:00
xxalpha
2aa05fdc45 Changed input method 
Edit changelog
 2015-07-23 04:23:38 +01:00
xxalpha
1759d492f0 Made Agent IDs rewrittable. 
Added antag check for forging.
 2015-07-22 22:38:13 +01:00
phil235
2cf4b90ba8 Give refill canisters three separate charge values for standard, contraband(hacked) and premium(coin) items. 
So that next time someone increases the amount of items in a vending machine w/o updating the refill charges (looking at you /vending/clothing), it will affect the items in the same product list instead of only contraband.

I also updated the charges of the refill canisters to the correct amounts.

I removed the chef food section of the snack vending machine, nobody has ever used it.
 2015-07-22 22:06:04 +02:00
bgobandit
d0eb72fd3a #whoa #wow 2015-07-22 14:58:58 -04:00
xxalpha
8e00cdfe9a Fixed storage not updating when joining cable coils. 
Fixed stack objects not updating storage when deleted.

Added handle_atom_del proc to be called on destroy.

Label comment for handle_atom_del()
 2015-07-22 17:58:05 +01:00
Aranclanos
47706cf88b Merge pull request #10717 from Ikarrus/thisisafix 
Fixes Reset and Purge having "This is a bug." law on examine
 2015-07-21 16:12:43 -03:00
phil235
40967044cb Merge pull request #10707 from KorPhaeron/fixes 
Fixes
 2015-07-21 20:46:27 +02:00
KorPhaeron
d1dec3ffec Changed on phil's comments 2015-07-21 12:20:15 -05:00
phil235
452313a5fa Merge pull request #10534 from Xhuis/borg_deconstruct_all_firelocks_on_the_station_then_flood_plasma 
Firelock Construction and Deconstruction
 2015-07-21 17:52:14 +02:00
Ergovisavi
e6a8511ac1 Merge branch 'master' of https://github.com/tgstation/-tg-station into more_fire 2015-07-21 05:50:02 -07:00
Ergovisavi
5f6cf57e07 Merge branch 'master' of https://github.com/tgstation/-tg-station into more_fire 2015-07-21 05:32:08 -07:00
phil235
d2616d52fc Merge branch 'master' of https://github.com/tgstation/-tg-station into CatchThrownPieFix 
Conflicts:
	code/game/atoms.dm
	code/game/atoms_movable.dm
 2015-07-20 22:41:45 +02:00
phil235
76feff5dfa Merge branch 'master' of https://github.com/tgstation/-tg-station into HandcuffOverlayFix 
Conflicts:
	code/game/objects/structures/watercloset.dm
	code/modules/clothing/head/helmet.dm
	code/modules/mob/living/carbon/carbon.dm
 2015-07-20 22:37:06 +02:00
Ikarrus
bc5eac33a8 Needs a check here to let reset and purge be used. 2015-07-20 09:02:46 -06:00
KorPhaeron
99c5d75cef Adds check for firer being null 2015-07-20 06:07:17 -05:00
Ikarrus
ec3677da2d Fixes Reset and Purge having "This is a bug." law on examine 
No reason to have this string as far as I can tell.
 2015-07-19 23:20:04 -06:00
phil235
2833f59f5f A typo and a forgotten thing to do. 2015-07-19 22:16:09 +02:00
phil235
94d072828f Merge branch 'master' of https://github.com/tgstation/-tg-station into CatchThrownPieFix 
Conflicts:
	code/game/atoms_movable.dm
	code/game/objects/items/weapons/dice.dm
	code/game/objects/weapons.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/living_defines.dm
	code/modules/reagents/reagent_containers.dm
 2015-07-19 21:53:39 +02:00
Cheridan
b9f67a8334 Merge pull request #10668 from phil235/CyborgFlashFix 
Fixes drone and cyborg not being affected by mounted flashers.
 2015-07-20 11:53:03 -05:00
Cheridan
1c05fbcf6a Merge pull request #10450 from phil235/MechRefactoring 
Mech code refactor
 2015-07-20 02:00:11 -05:00
phil235
9eced1ac5b Fixes thrown closet opening to not use spawn(). 
Fixes throw_at() to look nicely for xeno leap by adding the diagonals_first argument.
Removes useless gateway/Crossed and gateway/Bumped().
Changes throw_at() to use diagonal directions.
I replaced the atom variable "throwpass" with the LETPASSTHROW pass_flags
I readded hit_check proc to catch things getting on the thrown thing's tile during its sleep(1) (especially needed for mobs running towards the thing), the only other possibility would've been to add throwing checks in atom/movable/Crossed() (called after every move) and I don't think it'd be worth it.
I added the item var "thrownby" to be able to continue to log the thrower of the item when it hits a mob. It removes the need for a thrower argument in throw_impact() and hitby().
 2015-07-19 21:29:35 +02:00
WJohn
001dd150e0 Merge pull request #10655 from MMMiracles/TWANG 
Adds a 'TWANG' sound effect for guitars
 2015-07-19 13:34:40 -04:00
Swag McYolosteinen
a2f338cabf Merge pull request #10343 from GunHog/Borgie_Lights 
[Review] Cyborg headlamps!
 2015-07-19 19:26:09 +02:00
Swag McYolosteinen
0f244730bc Merge pull request #10626 from Ikarrus/lizardmov 
AI Module Updates
 2015-07-19 18:06:06 +02:00
KorPhaeron
65f56e146d Liberty Station fix, alien whispering fix, plasma statue logging. 
Fixes the liberty station spawning an SMG without a firing pin by
creating an unrestricted variant of it. Added unrestricted L6 and
unrestricted bulldog object types for admin spawn since I was already
there.

Fixes aliens being able to whisper to ghosts.

Adds logging to shooting plasma statues.
 2015-07-19 10:31:52 -05:00
Ergovisavi
bf83ef4c53 Adds molotov creation recipe via tablecrafting, requring a drink bottle and a rag 
Nerfs the rag, allows it to be made with the biogenerator, adds a few to the chef/bartender's closets, and to the maint loot spawner
Adds the ability to empty out a fire extinguisher... for sabotage
 2015-07-19 04:12:30 -07:00
GunHog
f4407871ab Merge remote-tracking branch 'remotes/upstream/master' into Borgie_Lights 
Conflicts:
	code/game/gamemodes/shadowling/shadowling_abilities.dm
 2015-07-18 21:56:25 -05:00
Remie Richards
57b05f5a18 Merge pull request #10493 from phil235/SmokeFoamBuff 
Foam&Smoke buff, some tweaks to sorium/ldm effect, plus some fixes.
 2015-07-18 03:45:38 +01:00
Cheridan
a4a7c21744 Merge pull request #10653 from phil235/Fixarino 
Three simple fixes again
 2015-07-17 15:49:41 -05:00
Cheridan
41890b2845 Merge pull request #10637 from phil235/ShowerBurnFix 
Shower Fix
 2015-07-17 15:34:29 -05:00
phil235
e2d76a0116 Fixes drone and cyborg not being affected by mounted flashers. 
Remove eye stat damage from flashbang's bang() proc (eye damage is already handled in carbon/flash_eyes())
Changed many flash producing effect to affect all carbons instead of only humans.
The experimental weldingtool now produces less light than regular welding tool and can be used safely with only sunglasses.
 2015-07-17 17:12:16 +02:00