cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 21:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,421 Commits 61 Branches 14 Tags
031a98d14c7e6df2dfd8b7bab3dcd83c9338cd41
Commit Graph

9714 Commits

Author SHA1 Message Date
phil235
8e62d51812 Merge pull request #9801 from AnturK/rosebud 
Buffs whispers
 2015-06-25 13:39:56 +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
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
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
TheVekter
c2157b1a11 * Makes the Flux explosion bigger 
* Causes Immovable Rods to actually bisect the station
* Changes odds for more deadly Meteor Waves
* Fixes that FUCKING TEXT FOR MEATY ORE WAVES
 2015-06-21 20:03:14 -05:00
MrStonedOne
40c2ca5966 Tweaks adminhelp rejections and adds changelog 2015-06-21 13:23:42 -07:00
Razharas
e6b738734a Merge pull request #8876 from xxalpha/fixfixfix 
Cyber Implants + (Pt.2)
 2015-06-21 22:12:17 +03:00
Fayrik
58301912e2 This was way too much work, so this had better work now. 2015-06-21 20:04:16 +01:00
MrStonedOne
9583b1213b Adds new timer subsystem 
Adminhelps now use it so that they can cancel the timer to return the admin help verb.
Adminhelps now allow admins to reject the adminhelp, giving the user back the verb and a message telling them how to construct a better admin help.
 2015-06-21 11:55:38 -07:00
phil235
aa5541070c Merge pull request #10082 from xxalpha/bass 
Fixed not being able to insert a brain into an MMI.
 2015-06-21 19:33:45 +02:00
xxalpha
609d65af58 Fixed surgical step 'saw' not working properly on non humans. 
better
 2015-06-21 18:26:00 +01:00
xxalpha
3379fa5172 Fixed not being able to insert a brain into an MMI. 2015-06-21 17:50:03 +01:00
Cheridan
b1e252c69f Merge pull request #10021 from phil235/AIFloatFix 
Mobs that are anchored or buckled to something anchored no longer float in no gravity.
 2015-06-21 10:45:49 -05:00
Razharas
5532a09764 Merge pull request #10066 from Boggart/adminpmdebugmessagequickfix 
Removes a couple of debug messages from adminpm.
 2015-06-21 12:00:08 +03:00
Cheridan
3da5cfd336 Merge pull request #10047 from Iamgoofball/patch-82 
Removes Morphine Blob
 2015-06-21 01:51:43 -05:00
Ikarrus
8eba1d09bf Gang Update: Recruitment Edition 2015-06-21 00:04:36 -06:00
Ikarrus
4a34f6dc9b Cargo Shuttle Event Announcement Clarity 
Rewords the announcements for cargo shuttle events slightly so it's less confusing that they are referring to the cargo shuttle and that the message itself is directed at cargo.
 2015-06-20 23:56:41 -06:00
Boggart
ffbba1eb10 Removes a couple of debug messages from adminpm. 2015-06-20 21:30:14 -06:00
Remie Richards
c79963f7b7 Merge pull request #9792 from GunHog/AI_STOLE_MY_BIKE 
Malf AI module changes + Mechs for normal AIs!
 2015-06-21 00:30:03 +01:00
Remie Richards
ee1e30717a Merge pull request #9980 from LaharlMontogmmery/ContentTransfer 
Container Content Transfer - Good for Review (Again...Again.)
 2015-06-21 00:09:19 +01:00
Cheridan
05f65f04b8 Merge pull request #9866 from Xhuis/revenants 
Revenant Rework (NOW WITH LESS CLOSING)
 2015-06-20 13:24:02 -05:00
Swag McYolosteinen
859c5e66e0 Merge pull request #9930 from duncathan/givinunarysomelovin 
Brings some unary devices closer to the present
 2015-06-20 20:14:02 +02:00
Swag McYolosteinen
7929b7dcd7 Merge pull request #10031 from Ikarrus/gangfashion 
Gang Update: Fashion War Edition
 2015-06-20 18:06:19 +02:00
Cheridan
a2948ba203 Merge pull request #9956 from Jordie0608/whocodesthecodemen 
Various admin improvements
 2015-06-20 00:53:30 -05:00
Cheridan
a45804dcfe Merge pull request #10033 from optimumtact/reeeeeeee_hitby_messages 
Hitby messages removed, may help with singularity lag from throwing
 2015-06-20 00:19:03 -05:00
Cheridan
f5525749ce Merge pull request #10027 from phil235/StraightJacketBuckleResistFix 
Fixes being able to unbuckle yourself while straightjacketed
 2015-06-20 00:07:56 -05:00
Iamgoofball
85975e3d53 Removes Morphine Blob 
the last few times I tried to make this commit I fell asleep for 3 hours accidentally bumping the code
 2015-06-19 22:06:19 -07:00
Cheridan
08f46d5652 Merge pull request #10016 from Ikarrus/iambulletproof 
Buffs bulletproof vests back to 80
 2015-06-19 18:49:02 -05:00
Xhuis
2823a98244 Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-19 11:23:45 -04:00
Swag McYolosteinen
e4281bbaab Merge pull request #10019 from Thunder12345/autoshotgun 
Moved combat shotguns to shotgun/automatic/combat
 2015-06-19 17:06:00 +02:00
Swag McYolosteinen
1dde070d18 Merge pull request #9800 from Dorsisdwarf/wittybranchname 
Buffs nuke ops [merge ready]
 2015-06-19 12:00:23 +02:00
Ikarrus
e27cdc7efe Resolved Conflicts: 
code/game/gamemodes/gang/dominator.dm
 2015-06-18 23:05:51 -06:00
Ikarrus
2605ed586b Reverts dominator sound change 
Dominator sets Delta Alert now
Delta Alert text changed to accommodate this change (+3 squashed commit)

Squashed commit:

[3129c95] Icon state update

[21bddf3] Dominators play the malf sound when activated (until I can find a better alternative).

[2289074] Unfucks changelog (+1 squashed commits)

Squashed commits:

[2289074] Unfucks changelog
 2015-06-18 23:00:04 -06:00