cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-28 10:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,313 Commits 61 Branches 14 Tags
5259e73f4dc9eab8dda3301a06a0b6f14ec247bd
Commit Graph

16371 Commits

Author SHA1 Message Date
PKPenguin321
b28da9cb97 Adds emag functions to chem dispensers (#18153) 
* adds emag functions to chem dispensers

* chemical changes, slight code changes

* fixes multiple emagging
 2016-06-08 11:09:25 +12:00
Sawu
dc20a94dd2 SNPC Updates (#18307) 
* SNPC Updates
* SNPCs now use their custom processing by default, with a few tweaks. This is a temporary fix to ensure they work appropriately until @MrStonedOne's MC is in place.
* SNPC custom processing will now watch for a failed loop and restart itself.
* Verb added for debugging SNPCs easily, must be enabled.
* SNPC customization now has three quick options, as well as the original choices.
* Spawns removed from laggier parts of doProcess(), now using waitfor instead
* Security SNPCs will target people set to arrest.
* Chefs, Botanists and Bartenders should now function more appropriately.

* Removes commented code

* Fixes an invalid loop

* REALLY fixes it this time
 2016-06-08 10:32:10 +12:00
oranges
c65a4b3bd1 Merge pull request #18312 from MMMiracles/iamagoodcoder 
fixes previously implemented ruins
 2016-06-08 10:30:49 +12:00
oranges
e283f14c1c Merge pull request #18305 from MrStonedOne/patch-211 
Fixes ghost images not having byond member iconstates
 2016-06-08 09:10:19 +12:00
Joan Lung
61c2d6aee0 Merge pull request #18279 from GunHog/Mining_Borgs_Need_Love_Too 
Mining Cyborg Hyper-Kenetic Accelerator Upgrade
 2016-06-07 17:09:39 -04:00
oranges
0187de935d Merge pull request #18300 from JJRcop/localhost_is_always_admin 
Localhost and .dmbs opened with dreamseeker always get admin
 2016-06-07 22:43:11 +12:00
LatD
25827d6ccb [Ready] Tweaks some R&D levels (#18246) 
Removes tech levels from some traitor objectives. They had tech levels even before the remake but apparently now that the levels got raised that became a problem. Also some small tweaks to other items to make some early levels easier to get.
 2016-06-07 20:18:19 +12:00
oranges
e06b7d52f2 Merge pull request #18205 from Steelpoint/Vest 
Vest Buff (Vest, Helmet, Warden Hat)
 2016-06-07 16:43:35 +12:00
oranges
636b35bb5e Merge pull request #18291 from coiax/dragon-loot-moved 
Moved dragon loot into necropolis_chests.dm
 2016-06-07 14:59:56 +12:00
oranges
f338db8c28 Merge pull request #18223 from Incoming5643/patch-11 
The ghost of poly won't interfere directly in the lives of mortals
 2016-06-07 14:42:52 +12:00
oranges
f81634c2eb Merge pull request #18218 from Xhuis/rich_bears 
Fixes and tweaks
 2016-06-07 14:02:53 +12:00
Jack Edge
8cbb10cab2 Moved dragon loot into necropolis_chests.dm 
In addition:
- Added an admin notification when dragon blood causes the dragon
transformation.
- Fixes #18275, lava staff can no longer turn transit tiles to lava.
 2016-06-07 02:57:12 +01:00
oranges
a1b0620c5f Merge pull request #18132 from GunHog/Aimed_Spit_For_Mista_Jay 
Aimed Neurotoxin Spit
 2016-06-07 13:54:04 +12:00
GunHog
48ce081d91 Mini fix 
Catches an oversight
 2016-06-06 20:53:19 -05:00
oranges
d360479227 Merge pull request #17934 from coiax/bluespace-shelter-templates 
Bluespace shelters use map templates
 2016-06-07 13:43:59 +12:00
oranges
76ab2582bf Merge pull request #18321 from Cruix/nukeops_war_fix 
[s] Fixes nuke ops being able to fly to the station and then declare war
 2016-06-07 13:32:49 +12:00
Xhuis
ab41d85354 Conflicts II 2016-06-06 21:31:38 -04:00
oranges
ef53e135e0 Merge pull request #18266 from MMMiracles/minipickers 
Adds compact pickaxes
 2016-06-07 13:23:26 +12:00
Jack Edge
a9b43f06bf Bluespace shelters use templates 
🆑 coiax
rscdel: Bluespace shelter capsules can no longer be used on shuttles.
rscadd: Bluespace shelters may have different capsules stored. View what
your capsule has inside by examining it.
/🆑
 2016-06-07 02:11:35 +01:00
oranges
c62e2ba11f Merge pull request #18264 from coiax/deathrattles 
Deadchat listeners will hear when people die
 2016-06-07 13:08:52 +12:00
oranges
78b73b5163 Merge pull request #18292 from ChangelingRain/mercyofRATVAR 
Adds the Clockwork Obelisk, Mania Motor, and Vitality Matrix
 2016-06-07 13:08:01 +12:00
GunHog
bfd644231f Merge remote-tracking branch 'remotes/upstream/master' into Aimed_Spit_For_Mista_Jay 
# Conflicts:
#	code/modules/mob/living/living_defines.dm
#	icons/mob/actions.dmi
 2016-06-06 20:05:23 -05:00
oranges
017cd65250 Merge pull request #18047 from kevinz000/embraceTheMemes 
Reactive Table Armor - If you can't beat the memes, embrace them
 2016-06-07 13:03:08 +12:00
PKPenguin321
d3ba2473cc makes plant analyzers fit in belts again (#18324) 2016-06-06 20:01:51 -05:00
oranges
9d6936a607 Merge pull request #18197 from pudl/tank 
adds high-capacity watertanks
 2016-06-07 13:01:16 +12:00
oranges
04e882b365 Merge pull request #18259 from Iamgoofball/greytide 
Refactors the Prison Break event into the Grey Tide event
 2016-06-07 12:48:52 +12:00
Jack Edge
1c4e91d8b1 Deadchat listeners will hear when people die 
🆑 coiax
rscadd: Deadchat is now notified when a sentient mob dies.
/🆑

Includes the area name, because why not, I guess?
 2016-06-07 01:26:00 +01:00
Joan Lung
22aff568c6 but with conflictless sprites 2016-06-06 19:59:37 -04:00
TechnoAlchemist
9ef7ca5ee6 Unique spectral sword sprite. (#18322) 2016-06-06 18:26:17 -05:00
unknown
54e03cb325 Fixes nuke ops being able to fly to the station and then declare war, and fixes screwdrivering the syndicate shuttle computer breaking it forever. 2016-06-06 18:50:39 -04:00
oranges
0714a272f0 Merge pull request #18237 from coiax/fix-18236 
KA now use the timer subsystem
 2016-06-07 10:26:05 +12:00
oranges
ccbc302876 Merge pull request #18282 from coiax/removing-spawn 
Removes spawn() from some things
 2016-06-07 10:21:54 +12:00
oranges
744b722a12 Merge pull request #18241 from phil235/BloodRefactor 
Blood refactor stuff
 2016-06-07 10:09:35 +12:00
oranges
24cf031cb1 Merge pull request #17968 from Bobylein/chem-bottles-rework 
Pill icons based on master reagent and transparent chem bottles
 2016-06-07 09:56:11 +12:00
MMMiracles
ffcde7ffe5 what is testing code? 2016-06-06 14:56:02 -04:00
GunHog
ab0bac909a Adds cooldown 
Minor cooldown added to avoid xenos being machine guns!
 2016-06-06 09:53:24 -05:00
Kyle Spier-Swenson
86c6a60021 Fixes ghost images not having byond member iconstates 
(these icon states will still not show if the user requests they don't see such things, but now should show when they do.)
 2016-06-06 01:58:22 -07:00
Cheridan
cad969ce7b Merge pull request #18257 from KorPhaeron/snow 
redpills snow turfs
 2016-06-06 00:40:40 -05:00
JJRcop
9721bdb4a9 Admin granted to loopback connections or opening .dmb with DS 2016-06-06 01:23:36 -04:00
Joan Lung
f64e687250 Adds the Clockwork Obelisk, Mania Motor, and Vitality Matrix 2016-06-05 18:45:32 -04:00
Kevin
e584256330 removed pill changes 2016-06-06 00:10:32 +02:00
KorPhaeron
8f03e896bc Missing equal sounds 2016-06-05 16:50:50 -05:00
Jack Edge
a01b48aa48 Removes spawn() from some things 
Yay, refactoring.
 2016-06-05 20:08:36 +01:00
Jack Edge
5fa854e252 Fixes a runtime when the AI uses binary chat 
Might fix some bugs? Bugs that I introduced, but phil mentioned a
runtime.
 2016-06-05 18:52:39 +01:00
GunHog
80065468d4 Hyper KA for mining borgies <3 
- Mining Cyborgs may now be upgraded with Hyper-Kenetic Accelerators
- Same cost and reqs as human version.
 2016-06-05 11:57:39 -05:00
phil235
40a371296a Adding lizard blood pack in medbay storage's freezer crate. 
Added a var/exotic_bloodtype to species, instead of hardcoding a lizard type.
Fixes proc for objects who should never be bloodied.
 2016-06-05 18:12:08 +02:00
oranges
69bd3575e3 Merge pull request #18228 from ChangelingRain/swordofRATVAR 
Additional Ratvar conversion effects and related changes
 2016-06-06 01:35:26 +12:00
oranges
e1055df57f Merge pull request #18235 from coiax/when-it-happens-we-will-know 
[s] Makes winning a pulse rifle little more noticable
 2016-06-06 01:33:12 +12:00
oranges
227b404a5e Merge pull request #18144 from coiax/robustin-blew-my-mind 
Adds two Fun verbs for admins (and one boring one)
 2016-06-06 01:32:50 +12:00
oranges
c09046e3f1 Merge pull request #18201 from PKPenguin321/cmo-implanter 
Refines autoimplanter code, gives CMO single use autoimplanter for HUD augment
 2016-06-06 01:25:52 +12:00