cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-06-10 00:27:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,345 Commits 72 Branches 14 Tags
4e644df7cc94ffcf94f7544510a949b81e933db8
Commit Graph

19601 Commits

Author SHA1 Message Date
KorPhaeron 4e644df7cc Runtime fix 2015-09-24 16:17:37 -05:00
KorPhaeron b1185747bb Fixes 2015-09-24 12:55:54 -05:00
Razharas 7fbde15c51 Merge pull request #11934 from Lijah99/MechBuckleCheck 
Adds a buckle check for entering mechs, works on all mobs
 2015-09-24 02:14:40 +03:00
Razharas d3aa84e978 Merge pull request #11937 from KorPhaeron/profligateslikeyoubelongonthecross 
Hanging any mob from the kitchen spike
 2015-09-24 02:14:06 +03:00
Razharas 99d8e089c4 Merge pull request #11913 from Xhuis/based_space_gods_this_no_smoking_sign_is_troubling_my_autism 
Minor feature package
 2015-09-24 02:12:23 +03:00
Razharas 5041f46bba Merge pull request #11910 from Lijah99/RPD_true_suicide 
Adds a suicide message for the RPD
 2015-09-24 02:07:25 +03:00
Razharas 6ddb1bf1ce Merge pull request #11904 from Miauw62/newposters 
Removes the shitty red faction poster and replaces it with two new ones.
 2015-09-24 02:06:52 +03:00
Razharas 1105a2b820 Merge pull request #11899 from kingofkosmos/altclickrotatepipe 
Alt-click to rotate stuff
 2015-09-24 01:59:04 +03:00
Razharas 4a99082cf6 Merge pull request #11888 from KorPhaeron/toolboxcrusaders 
Guardian Changes
 2015-09-24 01:46:59 +03:00
Razharas f8e2f721c3 Merge pull request #11877 from Core0verload/suicide 
Russian roulette: "Spin the chamber" edition.
 2015-09-24 01:44:12 +03:00
Razharas b2e42f518d Merge pull request #11876 from Aranclanos/beaker 
Adds a qdel check for when the beaker spills their reagents on the tu…
 2015-09-24 01:43:03 +03:00
Razharas 01a23d020e Merge pull request #11848 from xxalpha/smoothlattice 
Lattices and catwalks now use generic icon smoothing.
 2015-09-24 01:39:12 +03:00
Razharas 78e9fe068f Merge pull request #11782 from Jordie0608/bagsofholdingsarejustincompletesingularitygrenades 
Rework of adv egun failure mechanic
 2015-09-24 01:34:38 +03:00
Razharas aa87f0a785 Merge pull request #11749 from feemjmeem/suicides-sep12 
updated suicide_acts for newspaper, spraycan, and soap
 2015-09-24 01:33:27 +03:00
Razharas 3d69d48c18 Merge pull request #11940 from Steelpoint/BiosuitSec 
Security Biosuit Sprite/Armour Change
 2015-09-24 01:24:31 +03:00
Razharas d6779855c1 Merge pull request #11946 from Lijah99/ACTUALLYFixesVehicleFootprints 
ACTUALLY fixes footprints while in a vehicle/buckled
 2015-09-24 01:22:49 +03:00
phil235 c410d1680d Fixes brains sharing their dna with another carbon, which causes runtimes when the carbon and its dna is deleted. 2015-09-23 23:05:26 +02:00
KorPhaeron 2e8e8a15c7 Oops 2015-09-23 13:17:15 -05:00
KorPhaeron b4eea5144b Timer 2015-09-23 13:13:24 -05:00
Razharas e9bed91a1e Merge pull request #11925 from Core0verload/matter-final 
Materials - final solution
 2015-09-23 21:11:17 +03:00
KorPhaeron d68fbc98a2 Delay 2015-09-23 13:06:59 -05:00
Razharas c174fbfbc3 Merge pull request #11912 from KorPhaeron/literallytakingnodamage 
Changeling Armor Rebalance
 2015-09-23 20:58:13 +03:00
KorPhaeron c11edd8418 Butcher update 2015-09-23 12:30:56 -05:00
Razharas e4cb3cd6b0 Merge pull request #11941 from KorPhaeron/funremovalmk2 
Removes DNA Aide
 2015-09-23 20:24:00 +03:00
KorPhaeron b0a89af2c6 Left a line in the wrong place 2015-09-23 01:16:30 -05:00
KorPhaeron 29e1858fcf New sprites 2015-09-22 23:53:26 -05:00
KorPhaeron f16b4e1903 Merge remote-tracking branch 'tgstation/master' into toolboxcrusaders 2015-09-22 23:41:02 -05:00
Cheridan 8a71d3e875 Merge pull request #11809 from Xhuis/even_better_than_a_mass_emagger 
Uplink rebalance
 2015-09-22 23:40:18 -05:00
KorPhaeron 0afa381114 Removes potential exploit 2015-09-22 20:12:14 -05:00
Razharas a5d7ae8d92 Merge branch 'master' of https://github.com/tgstation/-tg-station 2015-09-23 03:24:17 +03:00
Razharas e5296ffa7d AnturKs fixes without mutation fix 
AnturKs fixes without mutation fix
 2015-09-23 03:21:00 +03:00
xxalpha 36ae116a48 Added another mode for smoothing (smooth with all subtypes). 2015-09-23 00:55:10 +01:00
Cheridan cbed291596 Merge pull request #11892 from Aranclanos/tempvent 
Fixes the alien infestation event not triggering
 2015-09-22 16:27:09 -05:00
Xhuis 05435d4ff7 Some code improvements 2015-09-22 17:24:59 -04:00
Lijah99 d515d55558 ACTUALLY fixes footprints while in a vehicle/buckled 2015-09-22 15:17:04 -06:00
Xhuis 6711406d6a Conflicts 2/3 2015-09-22 16:37:00 -04:00
xxalpha fc073def62 Merge remote-tracking branch 'upstream/master' into smoothlattice 2015-09-22 19:40:01 +01:00
Keklorde 931a732f9c adds a buckle check mid-enter 2015-09-22 12:14:48 -06:00
Keklorde 4ceb4590ff Update mecha.dm 2015-09-22 10:56:26 -06:00
KorPhaeron b1b03daf13 Update genetics.dm 2015-09-22 11:50:27 -05:00
Razharas 835da91620 Merge pull request #11883 from phil235/DnaMonkeyStuff 
DNA rework
 2015-09-22 18:43:27 +03:00
Steelpoint cca48e61f1 SecBioSuit 2015-09-22 23:17:49 +08:00
KorPhaeron 1484390e76 Removes extra bits 2015-09-22 06:05:17 -05:00
KorPhaeron cce0bf2e9d Meatspike 2015-09-22 05:33:02 -05:00
Lijah99 77b8be191a Adds a buckle check for entering mechs, works on all mobs 2015-09-21 22:39:14 -06:00
KorPhaeron 42352e915b Buckling fixes 2015-09-21 23:13:02 -05:00
Cheridan f5e8f921aa Merge pull request #11900 from kingofkosmos/doafterdragemptycontainer 
Pause before drag-drop-emptying container to the floor
 2015-09-21 22:33:08 -05:00
Cheridan 6070a82050 Merge pull request #11887 from MrPerson/drag_equals_equals_equals_click 
Dragging an item onto itself === clicking it
 2015-09-21 21:59:12 -05:00
Jordie 32932ae7d5 Merge pull request #11896 from KorPhaeron/forsaeg 
Admin Verb: Offer Control
 2015-09-22 12:26:23 +10:00
Jordie 01c362f069 Merge pull request #11757 from Xhuis/side_antagonist_tweaks 
Side Antagonist Tweaks
 2015-09-22 12:26:00 +10:00