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

5332 Commits

Author SHA1 Message Date
Razharas
454dc14b44 Merge pull request #10117 from Iamgoofball/explosive_implant 
Microbombs and Macrobombs, Nuke Ops start with Microbombs once more
 2015-06-25 12:49:03 +03:00
Iamgoofball
2cdb4dbe92 fixes 2015-06-24 22:07:46 -07:00
Cheridan
7568861a57 Merge pull request #10102 from xxalpha/chef 
Fixed being able to interact with electropack while wearing it.
 2015-06-24 10:07:45 -05:00
Iamgoofball
ab36f89844 NUKE OPS START WITH MICROBOMBS NOW, nerfs microbombs because I made them way too powerful and 20 of them was actually double the bombcap 2015-06-23 21:37:21 -07:00
Iamgoofball
4294a583b0 Microbombs and Macrobombs 2015-06-23 15:36:01 -07:00
Iamgoofball
856edee625 WHOOPS 2015-06-23 12:57:28 -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
e3fa954daa Merge pull request #10025 from phil235/WindowBugFix 
Two window/windoor bugfixes
 2015-06-23 12:23:32 -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
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
95b2cc2b09 Merge pull request #10092 from TheVekter/dangerwillrobinson 
Danger Update: Meteors, Rods, Flux and Grav
 2015-06-23 03:39:41 +01:00
TheVekter
ab4a0ade28 fixed the changelog FOR REAL THIS TIME, also fixed bad coding 2015-06-22 21:30:50 -05:00
xxalpha
0d6ac5c30c Fixed being able to interact with electropack while wearing it. 2015-06-22 23:16:22 +01: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
Cheridan
79d2358303 Merge pull request #10067 from Boggart/constructionpermitfix 
Fixes construction permits dissapearing even when usage fails
 2015-06-21 23:41:16 -05:00
Razharas
e6b738734a Merge pull request #8876 from xxalpha/fixfixfix 
Cyber Implants + (Pt.2)
 2015-06-21 22:12:17 +03:00
Ikarrus
75d444b836 Fixes Broken C4s 
Trying to place a C4 on an object will currently move the object onto your tile, and produce a runtime. This was because the code was trying to drop the target rather than the C4.
 2015-06-21 10:18:15 -06:00
Boggart
81d753a9d4 Fixes construction permits dissapearing even when usage fails and fixes a small grammar error with blueprints. 2015-06-20 22:04:39 -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
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
Jordie0608
538d4ad303 Merge branch 'master' of https://github.com/tgstation/-tg-station into glassisapaintosprite 
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
 2015-06-20 18:37:39 +10: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
Xhuis
bc7d1ab93d Changes the way the airlock charge works 2015-06-19 14:46:06 -04: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
Xhuis
e1356f889e Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-18 23:37:06 -04:00
oranges
ea1df76a6d Hitby messages removed, may help with singularity lag from throwing 2015-06-19 15:32:56 +12:00
Ikarrus
46a5e578e4 Gang Update: Fashion War Edition 
This update primarily deals with gang outfits and expands on how they affect the round.
 2015-06-18 20:01:57 -06:00
Remie Richards
f15c81d527 Caps armour to 90% damage reduction, bai bai invincibility, Adds armour_penetration variable to /item, counted for melee weapon and gun combat, Xenomorphs also have 10 armour_penetration per attack. 2015-06-18 20:36:36 +01:00
LaharlMontogmmery
86d0a50776 Revert dump_act and dump_from_storage 2015-06-18 21:21:41 +02:00
LaharlMontogmmery
3eb11eb48f Add extra rustling. Also adding mouse_over for lockers. 2015-06-18 19:55:15 +02:00
Thunder12345
1c83cc6d45 Pray pray pray 2015-06-18 18:07:57 +01:00
LaharlMontogmmery
38ab424b8b More OOP! Also preparing the bases for another future PR. 2015-06-18 18:59:04 +02:00
Cheridan
470f21a752 Merge pull request #10004 from Ikarrus/gangimplants 
Gang Update: Loyalty Implant Edition
 2015-06-18 10:41:15 -05:00
LaharlMontogmmery
373c918a4a Going through some hOOPs - bit of a overhaul. 2015-06-18 17:40:35 +02:00
phil235
e6dcabf245 Merge pull request #9960 from xxalpha/bass 
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
 2015-06-18 15:50:35 +02:00
phil235
91f05d1a21 Fixes windoor not being damaged by fires. Fixes not being to attack windows with a welder on harm intent. 2015-06-18 14:57:24 +02:00
phil235
98c158f958 Merge pull request #9845 from AnturK/buttsender 
Adds PDA-Message Photo Attachment
 2015-06-17 20:36:52 +02:00
LaharlMontogmmery
dd25853085 Moved all the istype check to storage_contents_dump_act, and added children for that proc for lockboxes and safes/briefcases 2015-06-17 20:28:40 +02:00
Cheridan
ee87a1dc23 Merge pull request #9974 from phil235/MirrorRaceChangeFix 
Mirror race change fix
 2015-06-17 12:54:19 -05:00
phil235
e52486cf8e Merge pull request #9933 from xxalpha/rapiddeconstructiondevice 
Fixes RCD wall deconstruction runtime.
 2015-06-17 17:13:39 +02:00