cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-14 02:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,225 Commits 62 Branches 14 Tags
ffed997ea46fb6e789d4a24f023d2528e116cf4e
Commit Graph

17608 Commits

Author SHA1 Message Date
oranges
ffed997ea4 Merge pull request #20276 from KorPhaeron/dispenser 
Exploding water tanks now actually throw the water out
 2016-09-04 09:46:34 +12:00
oranges
240a6f2823 Merge pull request #20267 from ChangelingRain/justanothersteppingstonetothenextgreatmaniacrushofdesignjustanotherstoneinthevoid 
Fixes beam-using projectiles runtiming if shooting a target adjacent to the firer
 2016-09-04 09:45:59 +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
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
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
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
KorPhaeron
ae102fbc0e Missing ) 2016-09-02 01:56:13 -05:00
KorPhaeron
84539b1e79 Explosive water tanks 2016-09-01 22:55:02 -05: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
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
Joan Lung
a6b3f3dc6e Fixes beam-using projectiles runtiming if shooting a target adjacent to the firer 2016-09-01 18:45:36 -04: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
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
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
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
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
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
nullbear
b5f2777fb0 Adds support for Multiple products (#20177) 
* Adds support for multiple recipe results.

Makes it so that recipes can have multiple biproducts, instead of just
one. The results list works just like the reagents list.

ex. list("reagentid" = 5, "otherreagent" = 3) where 5 and 3 are the
amounts produced.

recipe on_reaction 'created volume' is the multiplier for the recipe,
not the sum of the volume of the biproducts. Equations have been
adjusted to this change.

A couple of reactions are made slightly more efficient.

Removes a couple of trailing returns and unneccessary variable
declarations.

Scales cfl3 fireball a miniscule amount with created volume. the range
is increased by 1 for every 100 units mixed.

* updates pyrotechnics.dm

* Removes unneccessary comments and unrelated tweaks.

* Changes variable name for phil

* P is for Product. R is for Reagent.

* Adds support for inverse required temp reactions.

Ie. Cooling a mixture to cause a reaction, instead of heating it. Just
set 'is_cold_recipe' to 1 in the reaction.

* Fixes chapel exploding infinite loop.

Fixes weird bug. Adds unused colorless 'powderpile' icon to
reagentfillings.dmi
 2016-08-31 09:26:34 +12:00
XDTM
b37182c1ff Metal slimes can spawn glass if injected with water (#20179) 
* Glass slime

* phil235's changes, tested and working

* Less spaces more tabs
 2016-08-31 09:25:00 +12:00
Incoming5643
540fa28339 Quality of life pull for my recent commits (#20210) 
* Quality of life pull for my recent commits:

RPGloot will no longer try to place scrolls in secret satchels, as this would slowly turn the drop table into these fairly useless joke items.

Goes through and genders most(all) the pets in the game so the gender change potion can work on them. Many previously hard defined generic animals can now be either male or female.

* Secret satchel is now a bit more aggressive with making sure a satchel is placed

D E F I N E S

* "quality"

* Not Canon
 2016-08-31 09:23:54 +12:00
bgobandit
9f4d354065 Admin messages for prayers show the round's deity. (#20162) 
* Chaplain prayers show the deity in their admin message.

* made requested deity changes
 2016-08-31 09:07:33 +12:00
Iamgoofball
634662d6b4 Adds Freon to the game (#20188) 
* Adds Freon to the game

* MAP CHANGE MEMES

* hahahahafuck

* YOU SAW NNOTHING

* fuqq

* sd

* Fixes

* Fixes2

* fixes

* BALANCE

* mob icecubing ALSO FUCK YOUR STATUS EFFECT CODE @Xhuis

* i play pokemon go every day

* Reworks icecubing

* sjyuhdjzsadjhm x jymhuxzc

* Final Pass

* kmJCBQADVNWVBOJRFJN

* changes

* nnjhdxsjhjh
 2016-08-31 08:58:55 +12:00
yackemflam
d3aec95d82 Sniper rounds now blow off limbs (#20209) 
* Update bullets.dm

* Forgot about the non brutal rounds

* Update bullets.dm
 2016-08-30 08:12:08 -05:00
AnturK
645e99c1dc Merge pull request #20161 from KorPhaeron/surgery 
Surgery Stat Tracking
 2016-08-30 10:55:53 +02:00
Shadowlight213
e625464e09 Modular computer fixes and improvements 2 (#20170) 
* Fixes runtime with can_run

* tr
 2016-08-30 10:43:53 +02:00
PKPenguin321
afa17a66bd blacklists lattices from the tesla 2016-08-29 21:11:03 -07:00
oranges
ea90c161a0 Normalizes the ed209 to match portaturret fire time (#20200) 2016-08-29 22:03:19 -05:00
kevinz000
29779ed0ee chestproofing 2016-08-29 19:12:57 -07:00
kevinz000
a6af5eadb4 Revert "lavaproofing" 
This reverts commit e528b65915.
 2016-08-29 19:12:24 -07:00