cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-21 14:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,796 Commits 61 Branches 14 Tags
daa5b5b48ebfbf51daead2756eb22f04a63abfb3
Commit Graph

10755 Commits

Author SHA1 Message Date
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
Remie Richards
8b899636b2 Merge pull request #11604 from duncathan/itwaslessthan300000runtimessofranklyIammorethanokwiththis 
Fixes a BUNCH of atmos shit
 2015-09-07 13:49:01 +01:00
Aranclanos
732aa1f5be Merge pull request #11600 from octareenroon91/patch-6 
Correct 'You inject' text
 2015-09-06 20:29:28 -03:00
Razharas
580e889e7d Merge pull request #11590 from joonoro/turbinefix 
Fix turbine
 2015-09-07 00:08:30 +03:00
duncathan
50fc7578f7 fixes TEG 2015-09-06 13:16:00 -06:00
Razharas
93b9f96cfa Merge pull request #11341 from bgobandit/suicideisnotajoke 
Adds/tweaks several suicide messages.
 2015-09-06 06:42:00 +03:00
Razharas
889643deae Merge pull request #11564 from Jordie0608/thisbranchnameisalie 
Config announce admin login/out
 2015-09-06 06:40:15 +03:00
octareenroon91
1327441478 Correct 'You inject' text 
Injections will now correctly report the amount of reagent you inject. Lethal injection syringes specifically will report correctly.
 2015-09-05 16:47:21 -06:00
Firecage
d701946cd4 Adds do_after to the spider verbs. 2015-09-06 00:02:22 +02:00
Joonatan O'Rourke
ecbae74695 fix turbine computer 2015-09-05 10:45:57 +03:00
Aranclanos
ee458bb3db Merge pull request #11254 from duncathan/pipecleanup 
Pipe code cleanup
 2015-09-05 04:12:36 -03:00
Joonatan O'Rourke
77d91af82c fix turbine 2015-09-05 09:42:14 +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
duncathan
4fc54c238c fixes components not gc'ing; minor tweaks to QDEL_HINT_FINDREFERENCE 2015-09-04 22:09:01 -06: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
00123edb18 double whoops 2015-09-03 20:45:24 +10:00
Jordie0608
4e4324d9ce whoops 2015-09-03 20:44:39 +10:00
Jordie0608
9de0f3567d config announce admin login/out 2015-09-03 20:38:36 +10:00
bgobandit
ca34015b85 Removes minibomb suicide message. Fixes wand suicide message. 2015-09-02 23:07:40 -04:00
Aranclanos
d2903d077f Merge pull request #11530 from xxalpha/coilcablecorrection 
Fixed a couple of bugs with cable coils.
 2015-09-02 22:55:47 -03:00
Razharas
93077ab2e3 Merge branch 'master' of https://github.com/tgstation/-tg-station 2015-09-02 19:04:16 +03:00
Razharas
feb3d2adce Fixes comment 
Fixes comment
 2015-09-02 14:41:27 +03: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
Razharas
e0e5bbc978 Merge branch 'DSStuff' of git://github.com/Steelpoint/-tg-station into Steelpoint-DSStuff 2015-09-02 14:38:07 +03:00
xxalpha
4e7d0c6ed5 Fixed wizard slaughterdmssmsmsms 
asdasdasd
 2015-09-02 10:47:37 +01:00
Razharas
92172265e3 Merge pull request #11396 from RemieRichards/DataStructures-Stacks&LinkedLists 
Datastructures: Stacks & Linked Lists
 2015-09-02 10:34:19 +03: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
70d97ad5e4 Fixed a couple of bugs with cable coils. 2015-09-01 22:35:04 +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
Aranclanos
7d729e270b Merge pull request #11508 from Core0verload/spider 
Removes unused SpiderOS icons
 2015-09-01 12:25:56 -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
c94085dcbe Merge pull request #11489 from Core0verload/turbine 
Fixes roundstart turbine spawning broken
 2015-09-01 17:39:03 +03:00
Razharas
72610973cc Merge pull request #11427 from xxalpha/magborg 
Gave engineering cyborgs permanent magboots effect.
 2015-09-01 17:31:15 +03:00
Razharas
9d6ce85e9a Merge pull request #11414 from Xhuis/shadowling_update_4 
Shadowling Update IV
 2015-09-01 17:19:07 +03:00
Razharas
6724e65aae Merge pull request #11270 from ExcessiveUseOfCobblestone/master 
Simple RnD tweaks
 2015-09-01 16:40:25 +03:00
Razharas
1582526447 Merge pull request #11166 from GunHog/Sawumakesmewanttocry 
E.X.P.E.R.I-MENTOR fixes
 2015-09-01 16:06:58 +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