cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 13:04:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,886 Commits 61 Branches 14 Tags
815ef798e92cfc788b4e6bf73802ebe0c554e8a3
Commit Graph

4920 Commits

Author SHA1 Message Date
Razharas
17e5d0eea5 Merge pull request #11525 from xxalpha/dryshoes 
Absorbent galoshes.
 2015-09-10 22:01:03 +03:00
Aranclanos
f587588eb9 Merge pull request #11636 from duncathan/lol 
distro fix + fixes runtimes
 2015-09-09 20:37:51 -03:00
duncathan
b86464f573 woo more runtimes 2015-09-08 22:59:18 -06:00
xxalpha
a62c09bbb7 Merge remote-tracking branch 'upstream/master' into dryshoes 
Conflicts:
	code/__DEFINES/misc.dm
 2015-09-08 16:56:37 +01:00
Cheridan
daa5b5b48e Merge pull request #11599 from Firecage/Spiderwerbs 
Adds do_after to the spider verbs.
 2015-09-07 09:08:25 -05:00
Razharas
9f0f1a9234 Merge pull request #11531 from RemieRichards/Bloody_footprints 
Bloody footprints!
 2015-09-07 16:07:03 +03:00
Remie Richards
f0d0a4bf2d Merge pull request #11528 from Aranclanos/undergoingevacuations 
Undergoing evacuations latejoin message fix
 2015-09-07 13:54:54 +01:00
Razharas
889643deae Merge pull request #11564 from Jordie0608/thisbranchnameisalie 
Config announce admin login/out
 2015-09-06 06:40:15 +03:00
Firecage
d701946cd4 Adds do_after to the spider verbs. 2015-09-06 00:02:22 +02:00
Aranclanos
ee458bb3db Merge pull request #11254 from duncathan/pipecleanup 
Pipe code cleanup
 2015-09-05 04:12:36 -03:00
Cheridan
a816ff5f8f Merge pull request #11385 from Aranclanos/extrapug 
Fixes pugs not following their tail.
 2015-09-04 23:20:25 -05:00
Jordie0608
b7754d5ed7 announce login message as a config 2015-09-04 21:49:09 +10:00
c0
df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
Aranclanos
8a4260a311 Merge pull request #11545 from xxalpha/crawlinginmyskin 
Fixed wizard slaughter demons not getting bloodcrawl
 2015-09-03 12:17:25 -03:00
Jordie0608
9de0f3567d config announce admin login/out 2015-09-03 20:38:36 +10:00
Razharas
c2d3998e82 Merge pull request #11217 from Ergovisavi/fire_in_the_disco 
Small changes to mobs on fire
 2015-09-02 14:38:20 +03:00
xxalpha
4e7d0c6ed5 Fixed wizard slaughterdmssmsmsms 
asdasdasd
 2015-09-02 10:47:37 +01:00
Ergovisavi
bf69c85f71 Mobs on fire adjustments: 
-You heat up faster based on fire stacks
-Reduced the amount of fire stacks you lose over time per tick
-Increased the damage you take while on fire at the highest temperature point
-Increased the amount of fire stacks you get from hotspots
 2015-09-01 22:04:10 -07:00
duncathan
381139422c Merge branch 'master' of https://github.com/tgstation/-tg-station into pipecleanup 
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/components_base.dm
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/ATMOSPHERICS/components/unary_devices/vent_pump.dm
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
	code/ATMOSPHERICS/pipes/manifold.dm
	code/ATMOSPHERICS/pipes/manifold4w.dm
	code/ATMOSPHERICS/pipes/simple.dm
	code/_compile_options.dm
	code/controllers/subsystem/garbage.dm
	code/game/machinery/bots/mulebot.dm
	code/modules/mob/living/carbon/alien/say.dm
	code/modules/mob/living/simple_animal/bot_swarm/swarmer.dm
	html/changelogs/.all_changelog.yml
 2015-09-01 20:29:00 -06:00
Remie Richards
c560841438 Moves bloody footprint code out of step_action() and into human/Move() 2015-09-02 01:48:20 +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
xxalpha
4ead972306 Drying agent. Recolor dry shoes 
use define
 2015-09-01 22:59:30 +01:00
Aranclanos
7daee1797b Fixes the latejoin message about the evacuation shuttle showing on incorrect times. 2015-09-01 15:38:56 -03:00
Razharas
93ca749785 Merge pull request #11478 from xxalpha/crawlinginmyskin 
Changed blood crawl to be a spell.
 2015-09-01 18:36:20 +03:00
Aranclanos
87971f36c9 Merge pull request #11484 from spasticVerbalizer/swarmEmptyMessage 
Adds check for empty message in guardian communicate verbs
 2015-09-01 12:27:26 -03:00
Razharas
737ee58330 Merge pull request #10830 from xxalpha/HACKERS 
Made it possible to emag a cyborg more than once.
 2015-09-01 17:58:53 +03:00
xxalpha
a5062c812b Added emag cooldown. Added emag protection if cyborg slaved to tator AI. 2015-09-01 15:53:12 +01:00
xxalpha
75b2f53ce8 Merge remote-tracking branch 'upstream/master' into crawlinginmyskin 
Conflicts:
	icons/mob/actions.dmi
 2015-09-01 15:39:15 +01:00
Razharas
72610973cc Merge pull request #11427 from xxalpha/magborg 
Gave engineering cyborgs permanent magboots effect.
 2015-09-01 17:31:15 +03:00
xxalpha
642406e6c9 Merge remote-tracking branch 'upstream/master' into HACKERS 2015-09-01 14:05:35 +01:00
Razharas
a1e74cb22d Merge pull request #11334 from oisin100/patch-2 
Realistic Trees
 2015-09-01 16:00:13 +03:00
Razharas
37556b1c1f Merge pull request #11491 from Aranclanos/ghostyelling 
Fixes ghost yelling, now the message will be displayed.
 2015-09-01 15:56:29 +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
Razharas
829a88816b Merge pull request #11179 from Dorsisdwarf/andtheyrelikeitsdeaderthanyours 
Makes lings undetectable to the AI when using digital camo
 2015-09-01 11:00:38 +03:00
Razharas
446e784017 Merge pull request #11318 from kingofkosmos/borgdedcoverunlock_aidedunanchor 
Cyborgs unlocking cover and AI unanchoring upon dying.
 2015-09-01 10:08:08 +03:00
Razharas
cddb32f606 Merge pull request #11384 from Aranclanos/petemilking 
Fixes goat and cow milking, they were just simply not working.
 2015-09-01 10:02:27 +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
4644e99aa7 Changed bloodcrawl to be a spell. 
Changed blood crawl to be a spell.

BLOOOOD
 2015-08-31 16:24:27 +01:00
xxalpha
3f29a9866c Merge remote-tracking branch 'upstream/master' into qdelFixes 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
 2015-08-31 08:52:30 +01:00
duncathan
51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
Cheridan
69fa21e66d Merge pull request #11472 from Aranclanos/larvatypo 
REMOVES ALIEN LARVAS
 2015-08-31 00:30:31 -05:00
Aranclanos
d3b131a2ad Fixes ghost yelling, now the message will be displayed. 
Same with binary chat, blob overmind and alien hivermind.
 2015-08-30 19:14:30 -03:00
Razharas
d1c417e996 Merge pull request #11416 from xxalpha/airlockQDEL 
Added qdel(wires) to a bunch of objects Destroy proc.
 2015-08-31 00:08:27 +03:00
Maarten van den Berg
2a933dd0b3 Adds check for empty message in guardian communicate verbs 2015-08-30 16:28:35 +02:00
Jordie
f26a67348d Merge pull request #11455 from Ergovisavi/gang_hires_a_cleaner 
Some swarmer issue fixes
 2015-08-30 17:51:57 +10:00
Aranclanos
0da6bf9430 Merge branch 'master' of https://github.com/tgstation/-tg-station into petemilking 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
 2015-08-29 23:14:57 -03:00
Aranclanos
537c823fa8 Removes an incorrect type path, mob/living/carbon/larva, unused. It was just a typo. 2015-08-29 22:48:20 -03:00
Cheridan
04869ad71d Merge pull request #11451 from Aranclanos/carbonreagents 
Fixes alien larva breathing.
 2015-08-29 20:02:29 -05:00
Cheridan
7a469e240a Merge pull request #11437 from bgobandit/dronepax 
Refactors medical stacks used on simple animals.
 2015-08-29 18:55:27 -05:00
Ergovisavi
49ce1d65db -Fixes #11448 
-Fixes #11443
Swarmer related issues
Also adds feedback to where unactivated swarmers spawn, and if someone took one before you
Fixes the automated announcement system not qdel()-ing properly
 2015-08-29 14:45:28 -07:00