cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 12:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,214 Commits 61 Branches 14 Tags
078fc313372effcae2a809bc458ad66edbb529e5
Commit Graph

30220 Commits

Author SHA1 Message Date
oranges
078fc31337 Merge pull request #20265 from XDTM/GeneticsPlus 
DNA Scanners' rejuvenators are now potassium iodide instead of epinephrine
 2016-09-04 09:45:43 +12:00
oranges
c34bcaa9ad Merge pull request #20264 from GunHog/Silicon_Ghost_Laws 
Ghosts may now examine silicons to read their laws.
 2016-09-04 09:45:33 +12:00
Joan Lung
4a77599bd1 Readds the Drain Life rune (#20243) 2016-09-04 09:44:54 +12:00
Cheridan
a18142f681 Merge pull request #20289 from GunHog/Errorage_Is_Really_A_Nice_Guy 
Fixes and tweaks aux base stat logging
 2016-09-03 16:20:29 -05:00
Joan Lung
083f75f116 Talisman of Construction is more useful (#20228) 
* Cult structures are once again cosmetic only

* this is kor's fault

* oh heck i'll leave this in, maybe I can add a 'make pylon' rune at some point

* rip indentation

* acceptable

* error

* half
 2016-09-03 22:37:25 +02:00
Shadowlight213
4a2242b505 Fixes division by zero with gang spraycans (#20263) 
Fixes list index out of bounds runtime in VV
 2016-09-03 22:28:32 +02:00
Cheridan
eb59eb95a0 Merge pull request #20274 from Ergovisavi/purification_in_progress 
Fixes #20271
 2016-09-03 13:00:49 -05:00
AndrewJacksonThe2nd
42dbcf2f89 abhzsaxbhgszabnxzhbjmnzshbjmzdsxbmh 2016-09-02 16:01:52 -07:00
AndrewJacksonThe2nd
8298331538 fixes 2016-09-02 15:57:15 -07:00
AndrewJacksonThe2nd
082b4e4821 Merge branch 'master' of https://github.com/tgstation/-tg-station into goofmos 
Conflicts:
	code/game/turfs/open.dm
	code/modules/mob/living/living_defines.dm
 2016-09-02 15:51:26 -07:00
Joan Lung
32ef285db9 Merge pull request #20272 from Iamgoofball/patch-122 
Hacky freon fixes pending the rework
 2016-09-02 18:46:15 -04:00
AndrewJacksonThe2nd
0ada3764ae Merge branch 'master' of https://github.com/tgstation/-tg-station into goofmos 
Conflicts:
	tgui/assets/tgui.js
 2016-09-02 15:42:17 -07:00
AndrewJacksonThe2nd
dfcdf5866e fixes 2016-09-02 15:37:14 -07:00
AndrewJacksonThe2nd
2953360310 Removes reagent gas, Misc changes, REAGENT CODE OPTIMIZATION 2016-09-02 15:04:51 -07:00
GunHog
0575213666 Tweaks Aux Base Stat Logging 
Aux Mining Base stat logging actually works now, and includes the
coordinates where the base lands.
 2016-09-02 14:36:28 -05:00
Remie Richards
aa7ae7dc38 Fixes cloth from cutting bedsheets ending up INSIDE THE USER (#20286) 2016-09-02 12:40:16 -05:00
A-t48
91bbdfee56 Fixed cyborgs being able to use Power Warning emote when broken. (#20249) 
* Fix #19905

* Slight cleanup
 2016-09-02 20:14:15 +12:00
oranges
8b5697f37d Merge pull request #20175 from bgobandit/functionality 
You can hide small items inside urinals now.
 2016-09-02 14:58:38 +12:00
Ergovisavi
07baa6921c Fixes #20271 2016-09-01 19:21:36 -07:00
oranges
156a7f30e1 Merge pull request #20223 from PKPenguin321/patch-5 
Blacklists lattices from the tesla
 2016-09-02 14:12:35 +12:00
Iamgoofball
cbb73abb34 Update open.dm 2016-09-01 18:11:16 -07:00
Iamgoofball
bd1bb7c22a Update living_defines.dm 2016-09-01 18:06:47 -07:00
Iamgoofball
b777e451ef Update living.dm 2016-09-01 18:06:15 -07:00
Iamgoofball
e13f8ce2fc Hacky freon fixes pending the rework 
fixes the slip
 2016-09-01 18:04:45 -07:00
oranges
aff8e48038 Merge pull request #20260 from Kromgar/revert-20186-InsertFix2 
Revert "Fixes issues with packagewrap, trashbag, handlabeler, "
 2016-09-02 09:39:30 +12:00
Shadowlight213
378821e975 Fixes pizza bombs and boxes not deleting correctly. (#20254) 
* Fixes pizza bomb not deleting correctly.

* return
 2016-09-01 15:47:52 -05:00
XDTM
4cb3ff593e Epinephrine to potassium iodide 2016-09-01 21:22:15 +02:00
GunHog
ad66c15ac7 Ghosts may now examine silicons to read their laws! 
- Examining an AI or Cyborg as a ghost now displays its laws.
 2016-09-01 13:55:06 -05:00
Kromgar
2b235b8bba Revert "Fixes issues with packagewrap, trashbag, handlabeler, " 2016-09-01 12:18:24 -04:00
Leo
d4c6c7cf1a Small handcuff nerf (#20204) 
* Handcuff nerf

* Way better check for this

* Even better check

* Now we good
 2016-09-01 15:43:32 +02:00
AnturK
7599074f44 Merge pull request #20216 from Cruix/food_stuff 
Fixed food recipe code
 2016-09-01 09:34:07 +02:00
AndrewJacksonThe2nd
15eac23ac3 CHEMICAL GAS & Reworks 2016-08-31 19:35:39 -07:00
oranges
00495cedc5 Merge pull request #20186 from phil235/InsertFix2 
Fixes issues with packagewrap, trashbag, handlabeler,
 2016-09-01 10:13:30 +12:00
oranges
23915f99bb Merge pull request #20213 from KorPhaeron/water2 
Watertanks explode when shot
 2016-09-01 10:12:50 +12:00
oranges
cf720194ae Merge pull request #20214 from Cruix/telekinetic_gaia_removal 
Fixed bug with adding ambrosia gaia to hydro trays.
 2016-09-01 10:12:08 +12:00
oranges
b94aa6e07e Merge pull request #20049 from Iamgoofball/patch-112 
Fixes stock price spikes
 2016-09-01 09:11:30 +12:00
Leo
24534a07b9 Makes the admin bomb list a bit more useful (#20227) 
* Adds some stuff to bombing list

* More stuff

* Added IEDs, molotovs, pizzabombs, lemons and grenades to the bombing list.
 2016-08-31 14:03:31 +02:00
AndrewJacksonThe2nd
64643ee402 code memes 2016-08-30 23:37:12 -07:00
AndrewJacksonThe2nd
f405ed6603 GOOFMOS: FREON REWORK and WATER VAPOR 2016-08-30 23:25:32 -07:00
KorPhaeron
b3e8bcd9cb Merge pull request #20222 from Shadowlight213/radvious 
Makes radstorms more obvious
 2016-08-31 01:02:54 -05:00
KorPhaeron
c98ef0bced Merge pull request #20221 from kevinz000/lava-the-staff 
Makes necropolis chests not burn up in lava
 2016-08-31 01:02:03 -05:00
oranges
2d46e7766d Since infinite traitor items is okay, I improved it (#20108) 
* Since infinite traitor items is okay, I improved it

* Update packs.dm

* Update packs.dm

* Update packs.dm
 2016-08-31 16:58:05 +12:00
KorPhaeron
7b2a1b6aa7 Fixes another batch of typos. (#20234) 2016-08-30 21:52:19 -05:00
bgobandit
27e355d16b Fixes another batch of typos. 2016-08-30 20:57:28 -04:00
bgobandit
250ad0f213 untypecasts 2016-08-30 19:02:09 -04:00
nullbear
b1e8a11691 Merge pull request #3 from nullbear/multiple-product-hotfix 
Multiple Products Hotfix
 2016-08-30 16:00:12 -07:00
nullbear
451a32598c Multiple Products Hotfix 2016-08-30 15:59:30 -07:00
PKPenguin321
a785adb94f fixes bomb testing camera exploding forever 
Fixes https://github.com/tgstation/tgstation/issues/20231
 2016-08-30 15:51:07 -07:00
nullbear
03da8e6735 Merge pull request #2 from nullbear/slimecore-hotfix 
Slimecore hotfix
 2016-08-30 15:47:43 -07:00
oranges
bcef1426e7 Revert "Adds support for Multiple products" 2016-08-31 09:52:31 +12:00