cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 04:55:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,961 Commits 61 Branches 14 Tags
38605d1aeee51f1e4b9c364b0b30c6e825252c3c
Commit Graph

477 Commits

Author SHA1 Message Date
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
Razharas
161156cffc Merge pull request #11585 from bgobandit/legitposters 
Poster changes!
 2015-09-09 02:38:56 +03:00
bgobandit
2cee8c85dc Reworks the poster lists per cheridan 2015-09-07 12:18:06 -04:00
Razharas
9f0f1a9234 Merge pull request #11531 from RemieRichards/Bloody_footprints 
Bloody footprints!
 2015-09-07 16:07:03 +03:00
bgobandit
72ac379bbf henk 2015-09-07 07:18:58 -04:00
bgobandit
fd5e854118 IF TRAVIS DOES NOT WORK AFTER THIS I SWEAR TO CLOWN 2015-09-06 14:02:10 -04:00
bgobandit
c5984f4359 Merge branch 'master' of https://github.com/tgstation/-tg-station into legitposters 
Conflicts:
	_maps/map_files/MetaStation/MetaStation.v41G.dmm
 2015-09-06 13:27:51 -04:00
bgobandit
5cbe9e17e2 TRAVIS NOW COMPILES. 2015-09-04 19:17:51 -04:00
bgobandit
b9e779dc54 Makes Travis compile hopefully. 2015-09-04 19:13:51 -04:00
bgobandit
261494e659 Made some changes and repathing for posters. 2015-09-04 18:30:58 -04:00
xxalpha
3e3767c1d0 Tweak 2015-09-02 12:43:39 +01:00
xxalpha
f72ecc6fa1 Merge remote-tracking branch 'upstream/master' into xenoweedspread 2015-09-02 12:42:35 +01:00
Remie Richards
ff07337841 Bloody footprints! Human blood, Xeno blood, and Oil can now produce bloody footprints that fade off as the blood on the shoe fades. Affects gibs too. 2015-09-02 01:32:02 +01:00
Razharas
ad9fa24d5f Merge pull request #11515 from xxalpha/PLmD_69pXpk 
Tweaked foam spread logic, foam layer.
 2015-09-01 18:33:22 +03:00
Razharas
bfbe4e997e Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE 
Makes all Destroy() procs return properly
 2015-09-01 15:54:18 +03:00
duncathan
1f5510eb12 hahah woops 2015-09-01 02:16:12 -06:00
Razharas
bf85a525e7 Merge pull request #11071 from PatchouliKnowledge/ayycidlockers 
Lockers dump their contents if molten by alien acid
 2015-09-01 10:58:10 +03:00
duncathan
48b67e5a25 Merge branch 'master' of https://github.com/tgstation/-tg-station into returnQDEL_HINT_LETMEDIE 
Conflicts:
	code/game/objects/effects/landmarks.dm
 2015-09-01 00:11:33 -06:00
xxalpha
d0701c4088 Tweaked foam spread logic, foam layer. 
Better

Changelog

PERFORMANCE

get_turf(loc) is still superior
 2015-09-01 00:33:33 +01:00
xxalpha
c5bafe5420 Changed weed spread to be like gas spread. 
Changelog

PERFORMANCE

P-PERFORMANCE
 2015-09-01 00:31:39 +01:00
duncathan
51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
xxalpha
b9db8ce854 A few qdel fixes. 2015-08-27 13:15:41 +01:00
Jordie
bdd6a75382 Merge pull request #11119 from phil235/VaporizeMethodReaction 
reagents reaction() now has more application method
 2015-08-19 19:23:17 +10:00
Aranclanos
0dbc04d6a7 Fixes the alien hud icon for infected people not appearing. 
If a mob is infected by a changeling egg, aliens won't get the hud icon.
 2015-08-16 21:34:53 -03:00
phil235
64f028c065 Merge branch 'master' of https://github.com/tgstation/-tg-station into VaporizeMethodReaction 
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
 2015-08-15 16:36:21 +02:00
Swag McYolosteinen
46b519309e Merge pull request #11058 from Core0verload/surgery-organs-part2 
Surgery & Organs rework: Phase 2
 2015-08-13 18:04:16 +02:00
Swag McYolosteinen
5e18380888 Merge pull request #11103 from AnturK/latespawn 
Adds admin verb to reset latejoin spawns
 2015-08-13 16:38:11 +02:00
Remie Richards
83327ca40b Gang tags no longer rotate based on the user's dir, this was fugly and the sprites were NOT designed to do this. 2015-08-10 02:14:15 +01:00
phil235
d2a4024e7f reagent reaction() now use more methods. Instead of just INGEST or TOUCH, we now have INGEST (for injection, ingestion), TOUCH (for splashing), PATCH (for patch application and blob attack), and VAPOR (for smoke, foam and spray application). 
- TOUCH no longer transfer reagent by default, it's now only used for touch based effect like being flammable when touched by fuel or you and your stuff being acided when touched by acid).

- PATCH does no transfer of its own (but actual patches code do make a transfer) but is used for touch effect that ignore clothes and protection (blob attacks, patches effect going through hardsuits)

- VAPOR does reagent transfer but it takes into account clothing protection

Fixes a typo in humanoid/get_permeability_prot
Fixes acid splashing on objects not destroying it. Fixes acid splashing on turf not destroying objects on the turf.

Changed damp rag smothering code a bit.

Blob Smoke now doesn't do anything.
 2015-08-09 14:23:12 +02:00
c0
2e5cedef74 Added alien organs 2015-08-09 01:12:32 +03:00
AnturK
8a1e4435b6 Adds admin verb to reset latejoin spawns 2015-08-08 18:52:57 +02:00
PatchouliKnowledge
f6abc54eb8 Lockers dump their contents if molten by alien acid 2015-08-07 03:28:00 +03:00
Cheridan
88b2180017 Merge pull request #10949 from phil235/SleepSmokeFix 
Fixes sleeping smoke never disappearing.
 2015-08-02 06:56:47 -05:00
phil235
6a0be8b9a3 Fixes sleeping smoke never disappearing. Also switching processing.Add(src) to processing |= src. 
Makes the empty space on the chem bottles sprites clickable.
Fixes a runtime with reagent_containers/throw_impact()
 2015-07-31 15:01:35 +02:00
Cheridan
a35770928d Merge pull request #10929 from Ikarrus/gangganggang 
Gang Mode Fixes
 2015-07-31 01:41:53 -05:00
Ikarrus
89f539b804 no message 2015-07-29 19:11:03 -06:00
Ikarrus
3ea9de5053 Territory Tagging Fix 
Fixed needing to wait for the next payday before you can tag a territory that has it's old tag cleaned off.
 2015-07-29 19:10:22 -06:00
Swag McYolosteinen
624572a664 Makes spider vars transfer to next generations 
For admin fuckery
 2015-07-26 22:20:23 +02:00
Jordie
f5ae59a046 Merge pull request #10700 from Ergovisavi/more_fire 
Molotovs and a throw fix
 2015-07-25 20:05:05 +10: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
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
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
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
phil235
3e9ab4e3c1 Merge branch 'master' of https://github.com/tgstation/-tg-station into SmokeFoamBuff 
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/__HELPERS/unsorted.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/modules/reagents/Chemistry-Recipes.dm
 2015-07-16 14:09:12 +02:00
duncathan
ae417d2a03 Merge branch 'master' of https://github.com/tgstation/-tg-station into atmosrefactor2 
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
	code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/trinary_devices/filter.dm
	code/ATMOSPHERICS/components/trinary_devices/mixer.dm
	code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
	code/ATMOSPHERICS/components/unary_devices/Freezer.dm
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/ATMOSPHERICS/components/unary_devices/unary_base.dm
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
	code/modules/events/vent_clog.dm
	code/modules/mob/living/carbon/human/species.dm
	config/admins.txt
 2015-07-16 04:27:25 -06:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
phil235
72547af481 Merge branch 'master' of https://github.com/tgstation/-tg-station into SmokeFoamBuff 
Conflicts:
	code/modules/mob/living/carbon/human/species.dm
 2015-07-14 01:02:37 +02:00
phil235
b570af6795 Fixed catching banana creampie in mid throw (and similar objs). 3824 10536 (hitting a wall now makes the smashed pie effect appear ON the wall) 
Moved last_bumped var from movable to living.
Renamed /obj/machinery/field/proc/bump to bump_field() to avoid confusion with Bump(). Same thing with /obj/effect/mine/Bumped() -> triggermine().
Fixes sprite when hunter leaps into a wall. 10428
Removed some commented code here and there.
Remove allow_spin var, throw_at now uses a spin argument for that.
Throwpass atom var is no longer used to check whether thrown stuff can pass stuff (now using CanPass() proc like everything else), the var is still used for some adjacency click check.
A thrown mob hitting another mob now produces a sound; also thrown mob and target one no longer swap places even on help intent.
A thrown mob now is lightly hurt (and weakened) if he hits a wall/mob/dense object. Nerf the damage when thrown mob hit wall.(20 -> 10)
Thrown obj/mob no longer bounces off wall unless it's no grav. Heavy thrown items now push an unanchored obj/mob target.
Fixes losing all momentum when getting out of a thrown closet. 6569
A lot of work on throw_at, throw_impact, and hitby to make the code more OOP. Thrown items no longer collide with border items on the side. 10479
Fixes the killer crusher. 10507
 2015-07-14 00:51:19 +02:00
xxalpha
66e2941531 Adds an empty hugbox for admins to give. 
Maintbox

Re-added hugbox to boxstation perma.
 2015-07-12 17:44:13 +01:00