cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-18 18:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
37,883 Commits 72 Branches 14 Tags
08ecbf63ee65eb6ceee5cc480162bbdb976f26c3
Commit Graph
16440 Commits
Author SHA1 Message Date
PKPenguin321 08ecbf63ee fixes grilles exploding machines 2016-08-27 13:37:28 -07:00
PKPenguin321 438d8d8047 a few tweaks 
- makes tesla bomb immune so it wont destroy itself
- makes lights spew fire when they explode instead of the regular explosion
- makes cameras with EMP immunity also have tesla immunity
tesla can now keep itself fully contained (at least on box)
 2016-08-24 19:23:18 -07:00
PKPenguin321 86aeb63205 three months in the making 2016-08-23 18:17:55 -07:00
PKPenguin321 a187717536 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive-tesla 2016-08-23 17:33:24 -07:00
NikNakFlak fab4bcfeab Merge remote-tracking branch 'upstream/master' into makelife 
Conflicts:
	code/modules/hydroponics/grown/citrus.dm
 2016-08-23 17:08:36 -07:00
CheridanandGitHub 3b7362af9c Merge pull request #20054 from ChangelingRain/adaptabilityisavirtuethatnobodyappreciatestheailitytomoldyourselftowhatotherpeopleexpectandtheydontnoticebecausewhywouldtheytheyregettingwhattheyexpect 
Fixes cult floor overlays
 2016-08-23 18:17:48 -05:00
CheridanandGitHub 2a3bc4fa0d Merge pull request #20039 from TechnoAlchemisto/fucko! 
Adds a seclite to the detective's closet.
 2016-08-23 17:55:40 -05:00
CheridanandGitHub ad9dec941d Merge pull request #20038 from AnturK/hitmanbudgetraise 
Fixes kill objectives
 2016-08-23 16:43:12 -05:00
CheridanandGitHub bf5b5bd380 Merge pull request #20030 from MrStonedOne/erroinchargeoflights 
Removes unneeded lighting checks.
 2016-08-23 10:35:44 -05:00
CheridanandGitHub 33b56f24bd Merge pull request #20029 from yackemflam/patch-16 
Fucking hell people, fix these boxes
 2016-08-23 10:15:49 -05:00
orangesandGitHub 41d0e9ef50 Merge pull request #20022 from Cruix/the_cable_layer_is_the_only_thing_in_the_universe 
Fixed cable layer being undeletable
 2016-08-23 17:22:56 +12:00
orangesandGitHub ea3e013924 Merge pull request #20014 from ChangelingRain/dontspeakofyourmistakesdontspeakofanythingdontspeakhurtworryfearjoylovespeaknothing 
Fixes the raise dead rune
 2016-08-23 14:36:41 +12:00
Joan Lung f3ce0b9be2 robustin you massive shitcoder 
wew i need to rename that path
 2016-08-22 21:54:47 -04:00
Joan Lung b385a5068d robustin fuck you and your copypasting ways 2016-08-22 21:44:10 -04:00
Joan Lung 545739a8e3 TRUE 2016-08-22 21:20:52 -04:00
Joan LungandGitHub 844ed6786b Merge pull request #20007 from Ergovisavi/power_of_the_power_of_the 
Replaces the fireball book in the Drake chest with a book of Sacred Flame
 2016-08-22 21:02:51 -04:00
Ergovisavi 642f79bb59 Replaces the fireball book in the dragon chest with a book of sacred flame, a new spell. 2016-08-22 17:44:14 -07:00
orangesandGitHub cd0fd4fcf1 Revert "bettering of get area procs" 2016-08-23 10:45:28 +12:00
NikNakFlak b43ac4eb9c whoops 2016-08-22 15:25:25 -07:00
orangesandGitHub 2452202731 Merge pull request #20004 from XDTM/ActualClonePodFix 
Re-activated random mutations on cloning
 2016-08-23 09:09:36 +12:00
orangesandGitHub 4518aa3e0a Merge pull request #19991 from ChangelingRain/liesareatoolbutnotoneieverlikeusingunlesstheonlyotherchoiceistoodangeroustomeorothers 
Fixes decoy overlays being clickable
 2016-08-23 09:07:30 +12:00
orangesandGitHub 31c1e139c4 Merge pull request #19974 from xxalpha/damage 
bettering of get area procs
 2016-08-23 09:06:36 +12:00
TechnoAlchemist 6cb1bda8e4 Adds a seclite to the detective's closet. 2016-08-22 13:21:31 -07:00
AnturK 997bb6d323 Fixes kill objectives 2016-08-22 21:58:08 +02:00
xxalpha b1f1aea0ac Removed get_all_area_atoms proc. 
else
 2016-08-22 20:25:06 +01:00
MrStonedOne 83eca75951 Removes unneeded lighting checks. 2016-08-22 08:56:53 -07:00
yackemflamandGitHub cac121cf46 Update uplink_kits.dm 2016-08-22 18:49:03 +09:00
yackemflamandGitHub 68b73688ba Update uplink_kits.dm 2016-08-22 18:10:58 +09:00
yackemflamandGitHub 9f2b59f3f9 Fucking hell people, fix these boxes 2016-08-22 18:08:04 +09:00
unknown 68e34ab35b Fixed cable layer being undeletable 2016-08-21 16:45:18 -07:00
Joan LungandGitHub a470de1cd0 Merge pull request #20016 from Incoming5643/RememberToAlwaysClearYourSaves 
Secret Satchel's Hotfix 2: Electric Boogaloo
 2016-08-21 17:50:19 -04:00
Incoming5643andGitHub ca934347b3 Fixes my hot fix! 2016-08-21 17:45:49 -04:00
Incoming 06812de30a WHOOPS 2016-08-21 17:40:41 -04:00
Joan Lung c9f7ee8890 Fixes the raise dead rune 2016-08-21 17:22:14 -04:00
orangesandGitHub 020957b59e Merge pull request #19987 from ChangelingRain/imonlyhonestwhenitrainsanopenbookwithatornoutpageandmyinksrunoutiwanttoloveyoubutidontknowhow 
Cult runes now have stat logging
 2016-08-22 08:48:20 +12:00
Cruixandoranges f406e518cc Fixed some possible runtimes with pollCandidates() (#19919) 
* Fixed some possible runtimes with pollCandidates()

* Fixed bug in pollCandidatesForMobs()
 2016-08-22 08:45:22 +12:00
XDTM e49ca50e93 Actually fixes cloning dna 2016-08-21 15:19:43 +02:00
CheridanandGitHub e5b14476ae Merge pull request #19968 from ChangelingRain/extracttheresultinginkplaceinavialandexplaintoittheworthlessnessofthetreasuresofearthbreakitagainstamirrorthecauseofvanity 
Clockwork scripture now has stat logging
 2016-08-20 23:02:09 -05:00
Joan Lung 034cc4b08d what is an appearance var? 2016-08-20 19:40:24 -04:00
Joan LungandKorPhaeron dd1f5c99fd Removes the sine pope (#19966) 
* Removes the sine pope

* fuck you too map merger

* fuuuuuuck yooooooou

* map merger you betray me

* no message
 2016-08-20 18:12:51 -05:00
Incoming5643andKorPhaeron f64e2664be Lets lattice spawn in ruins by removing overzealous deletions (#19965) 2016-08-20 17:03:18 -05:00
Joan LungandGitHub dc460c518f Merge pull request #19964 from KorPhaeron/config 
Replace health config with damage multiplier config
 2016-08-20 17:09:01 -04:00
Joan Lung a2b4f53639 Cult runes now have stat logging 2016-08-20 15:16:32 -04:00
Jalleoandoranges 7da348a3b2 [s]Little fix and var in proc removal (#19821) 
* Fixes the gulag teleporter and removes two /var in proc decelerations

* Missed a item

* Revert "Fixes the gulag teleporter and removes two /var in proc decelerations"

This reverts commit ca07f531bb.

* Fixes it properly now

* Test

* Resolves to make it go to breath and gas masks paths instead of all mask paths. My mistake in the rush to solve it.
 2016-08-21 00:00:35 +12:00
Incoming5643andoranges f70ba63d3e You can smuggle smuggler's satchels to a future shift (#19838) 
* Hidden Smuggler Satchels hidden beneath the station now persist between rounds, though there's no assurances of WHEN they'll appear next and only one will ever appear in the round.

NOTE THAT THIS PULL INTRODUCES A CRITICAL BUG, DO NOT MERGE *JUST* THIS PR, AWAIT THE FOLLOWUP

* Finishes up satchel persistence.

Satchels require at least 20 saved bags before any will start spawning.

the var persistence_replacement can be set to a path to replace a very high risk item with a lower risk look alike. This is currently done with the nuke disk, the wizards spellbook, and the uplink implant

* DESIGNATED.
REMIE.
PULL.
 2016-08-20 16:27:02 +12:00
Joan Lung 920eb33380 like taking every curse of every witch ever 2016-08-19 18:53:15 -04:00
Joan Lung de3749f2aa can't be trusted 2016-08-19 10:00:53 -04:00
Joan Lung 08a67efd4d Clockwork scripture now has stat logging 2016-08-19 09:41:30 -04:00
KorPhaeronandoranges eb39ca8e6e Kinetic Accelerator Mods (#19942) 
* KA Mods

* Better examing

* Removes excess returns

* WHY indeed

* Updates projectiles properly

* Removes or replaces old hyper KA stuff

* Nerfs cooldown mod
 2016-08-19 21:04:25 +12:00
Joan LungandGitHub 61cff4e7bc Merge pull request #19940 from KorPhaeron/summons 
Summon Magic now functions like summon guns
 2016-08-18 22:31:02 -04:00