cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-09 15:59:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,495 Commits 63 Branches 14 Tags
46d7fb9bbd6531da30269cc0df27ecbae982e12a
Commit Graph

9752 Commits

Author SHA1 Message Date
Cheridan
46d7fb9bbd Merge pull request #10168 from phil235/FireaxecabinetFix 
Fixes runtime with do_after()'s that don't use a target.
 2015-06-26 20:12:15 -05:00
MrStonedOne
f06abf3e2f fixes compile error 
One pr added a path to an item(#10018) but another pr changed that path(#9932).
 2015-06-26 16:06:37 -07:00
Cheridan
b4ab182867 Merge pull request #10142 from phil235/SleepypenFix 
Fixes sleepy pen triggering morphine overdose message.
 2015-06-26 15:54:27 -05:00
Cheridan
a65ba96ecf Merge pull request #10020 from phil235/HiveloardCoreSmearing 
Changing messages when using hivelord core
 2015-06-26 15:45:31 -05:00
Cheridan
b9cdb3384a Merge pull request #9932 from Jordie0608/mycomputerismadewithoverlayswhyisntyours 
Icon and code improvements to fancy storage, cigarette packs, lighters, droppers and syringes
 2015-06-26 15:34:24 -05:00
Cheridan
3f1ecc5721 Merge pull request #10097 from phil235/SomeFixes 
Some little fixes
 2015-06-26 15:24:46 -05:00
phil235
ee13658752 Merge pull request #10018 from pudl/sam 
Abandoned Crates (Ported from Baystation12)
 2015-06-26 19:07:58 +02:00
phil235
2e61607d3f Merge pull request #10105 from xxalpha/chief 
Cleaned some clothing flags.
 2015-06-26 19:03:13 +02:00
phil235
adf553db5c Removes the singularity's toxin damage effect on mob. 2015-06-26 18:14:34 +02:00
Cheridan
f104517c89 Merge pull request #10146 from phil235/QueenUnconsciousIconFix 
Fixes stomach rumbling message, large xenoqueen unconscious icon, stamina stacking on aliens
 2015-06-26 10:51:47 -05:00
Cheridan
0b91e9d8e4 Merge pull request #10126 from Jordie0608/idkhowtheserverevenranwiththiserroraround 
Critical fix to admin memos and watchlist
 2015-06-26 10:44:03 -05:00
Cheridan
8c9169f9a8 Merge pull request #10144 from phil235/StimulantsBuff 
Buffs stimulants reagent.
 2015-06-26 10:37:46 -05:00
Cheridan
1ce57fa0b9 Merge pull request #10130 from xxalpha/fixfixfix 
Fixed reviver implant emp_act() resetting cooldown time.
 2015-06-26 10:00:28 -05:00
Jordie0608
d3f78294ad fixes edit reason and log for follow 2015-06-26 16:13:40 +10:00
phil235
2aeefad94d Fixes runtime with do_after()'s that don't use a target. 
Adding missing "target=src" to a couple do_after() calls.
You can now close a fire axe cabinet by clicking it with a full hand (if it's not broken/locked)
 2015-06-25 19:05:23 +02:00
phil235
8e62d51812 Merge pull request #9801 from AnturK/rosebud 
Buffs whispers
 2015-06-25 13:39:56 +02:00
phil235
28a030360c Fixes wrong message when a mob moves while inside another mob's stomach. 
Fixes large xenoqueen having wrong icon when unconscious.
Aliens now naturally recover from stamina damage.
 2015-06-25 02:15:49 +02:00
phil235
83629764d8 Buffs stimulants reagent. Changes the uplink stimpack description (immune to stuns -> nearly immune) 2015-06-25 00:55:11 +02:00
phil235
3c6607ad19 Fixes sleepy pen having enough morphine to trigger the overdose message, making it not stealthy. morphine amount reduced from 30 to 20u. 2015-06-25 00:30:09 +02:00
phil235
9b616daf8f Merge pull request #9837 from spasticVerbalizer/muteMessageFix 
Prevents 'unable to speak' spam on empty message
 2015-06-24 20:15:19 +02:00
Iamgoofball
33b9fc3a2c Update bottle.dm 2015-06-24 10:32:55 -07:00
Iamgoofball
9522feea87 phil says this fixes the armor problem TAKE 2 
expand dong
 2015-06-24 10:27:48 -07:00
xxalpha
305daf5d92 Fixed reviver implant EMP resetting cooldown time. 2015-06-24 15:36:40 +01:00
Jordie0608
58399f7602 Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours 
Conflicts:
	icons/obj/items.dmi
 2015-06-24 20:31:51 +10:00
Jordie0608
d079104e05 fixes schema and send2irc message 2015-06-24 16:54:59 +10:00
Jordie0608
29d7122095 Merge branch 'master' of https://github.com/tgstation/-tg-station into idkhowtheserverevenranwiththiserroraround 2015-06-24 16:48:17 +10:00
Jordie
dbad5fdea4 critical fix to admin memos 2015-06-24 15:58:41 +10:00
xxalpha
d18a98864a Remove optimization code. 2015-06-24 01:14:20 +01:00
xxalpha
0797226d2e Merge remote-tracking branch 'upstream/master' into chief 
Conflicts:
	code/modules/clothing/spacesuits/hardsuit.dm
 2015-06-23 21:50:16 +01:00
Iamgoofball
a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics 
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm
 2015-06-23 12:54:26 -07:00
Cheridan
62e635484a Merge pull request #10069 from Ikarrus/gangrecruitnerf 
Gang Update: Recruitment Edition
 2015-06-23 14:33:13 -05:00
Cheridan
c7e0b96314 Merge pull request #10083 from MrStonedOne/ISTHISVALID 
Admins can now reject shitty adminhelps
 2015-06-23 14:26:11 -05:00
spasticVerbalizer
2253a68c4b Merge conflict fix 2015-06-23 18:00:11 +02:00
Ikarrus
67ec200bc7 Few More Changes 2015-06-23 09:12:56 -06:00
Remie Richards
64f4adb41e Merge pull request #9510 from Cheridan/nuke_feedback 
Nuke Op COMMUNITY FEEDBACK PR
 2015-06-23 07:03:17 +01:00
Cheridan
ffedaeaeef Merge pull request #10072 from Ikarrus/shuttleloanclarity 
Cargo Shuttle Event Announcement Clarity
 2015-06-22 23:50:37 -05:00
Cheridan
f1fbfd93e6 Merge pull request #10029 from RemieRichards/ArmourPenetration 
Armour Penetration and Armour Damage Reduction nerf
 2015-06-22 23:49:18 -05:00
Cheridan
7b6fdbc8ce Merge pull request #9556 from Jordie0608/thisisnothebeginningoftotalatarinismthathappenedearlier 
Ports watchlist flagging for ckeys
 2015-06-22 23:36:06 -05:00
Ikarrus
3b326a973b Additional Changes 2015-06-22 22:29:51 -06:00
Cheridan
957f987b5d Merge branch 'master' of https://github.com/tgstation/-tg-station into dragnet 
Conflicts:
	icons/effects/effects.dmi
	icons/obj/items.dmi
 2015-06-22 22:57:53 -05:00
Remie Richards
f5f833ecbb Merge pull request #9971 from KorPhaeron/newfloors 
New Bluespace/Sepia slime reactions, new var for turfs
 2015-06-23 03:43:28 +01:00
Remie Richards
95b2cc2b09 Merge pull request #10092 from TheVekter/dangerwillrobinson 
Danger Update: Meteors, Rods, Flux and Grav
 2015-06-23 03:39:41 +01:00
Remie Richards
4ac8dd2fa6 Merge pull request #10023 from palpatine213/Ifyouwantitdoneright 
Positronic Brain fixes
 2015-06-23 03:39:27 +01:00
TheVekter
ab4a0ade28 fixed the changelog FOR REAL THIS TIME, also fixed bad coding 2015-06-22 21:30:50 -05:00
xxalpha
16504ef0cf Cleaned some clothing flags. Ported turf/Entered optimization from vg. 2015-06-23 01:52:14 +01:00
phil235
63358dcc78 fixing the formula. 2015-06-22 18:12:52 +02:00
phil235
13fdc68581 fixes singulo toxdamage. 2015-06-22 16:51:28 +02:00
phil235
1accee1c36 Fixes singularity not applying its tox damage to mobs. Adjusted its radiation and toxdamage values. 
Fixes simple animals that needs to breath not taking damage from lack of gas to breath on space turfs.
Fixes revenant not being spaceworthy.
Fixes simple_animal accumulating radiation indefinitely because they are unaffected by it.
 2015-06-22 16:10:24 +02:00
phil235
3f57259c69 Merge pull request #9466 from Fayrik/TheNanoing 
The Nanoing (Episode 2: The Fix Wars)
 2015-06-22 14:24:20 +02:00
TheVekter
6b5676bd7f Tweaked the meteor screen shake a bit, grav anoms now throw shit, and rods don't gib anymore. 2015-06-22 01:19:12 -05:00