cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-13 18:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,414 Commits 62 Branches 14 Tags
346819e30c4e4b94de6871d4441b52c06995e770
Commit Graph

11074 Commits

Author SHA1 Message Date
Jordan Brown
d132f97061 Merge pull request #37568 from pigeonsk/removeenruranium 
Removes enriched uranium
 2018-04-30 22:16:02 -04:00
vuonojenmustaturska
aec59e6c62 Merge pull request #37577 from kevinz000/patch-495 
Removes a duplicate comsig I accidently added
 2018-04-30 17:33:25 +03:00
Jalleo
5d2db204bc [s] Small tweaks and fixes a edgecase with machine construction (#37494) 
* Puts back required time for the emitter and field_generator and also removes a certain issue that certain people were causing

* Couple of things I missed

* I noticed the error with regards to atom and changed to obj like I was trying to originally. Also its fine to build on tables that wasnt the issue with this specific aspect.

* Edge windows. We need those.

* optimised the checks to be behind a if check for when you are actually needing to make something for the floor...

* Corrects a input proc by request

* Working is not my strong suit.
 2018-04-30 13:01:43 +03:00
vuonojenmustaturska
6f10c97329 Merge pull request #37499 from ShizCalev/bikehorn-fix 
Fixes bikehorn mood event
 2018-04-30 12:57:05 +03:00
kevinz000
c044cc33c4 Removes excess signal 2018-04-29 23:27:57 -07:00
Dax Dupont
8adbe2ed8e Adds a cooldown to PDA send to all messages. (#37422) 
* Adds a cooldown to PDA send to all messages.

* aaa

aaa

* forgot this one

* condom
 2018-04-30 02:09:10 -04:00
Pigeons
cc1391fc68 Removes enriched uranium 2018-04-29 20:26:58 -04:00
pigeons
96e384448c Actually links mineral sprites with their new location (#37564) 
Fixes sprites being broken
 2018-04-30 12:07:47 +12:00
vuonojenmustaturska
ccf8fc5bc5 Kills off three more flags from flags_2 (#37529) 
code: More flags have been moved to their appropriate places
SLOWS_WHILE_IN_HAND
FROZEN
NO_MAT_REDEMPTION

all moved to item_flags
 2018-04-30 10:32:23 +12:00
Jordan Brown
e402a6c9ac Merge pull request #37501 from ShizCalev/icon-fixes 
Fixes missing icons
 2018-04-28 15:55:56 -04:00
vuonojenmustaturska
98f8ca7553 Moves several clothing-specific flags from /atom to their proper type (#37486) 
* lavaproof

* more flags

* it compiles

* Remove a couple of lists
 2018-04-28 13:22:28 -05:00
as334
7d32eba2a1 Re-adds and reworks fusion. (#37384) 
add: Fusion is back
add: Fusion now happens with large quantities of hot plasma and CO2, consuming all the plasma rapidly and producing large amounts of energy. Other gases can also effect the performance of the reaction.
add: Fusion now produces radiation. Be careful around reactors.
fix: fixes fusion dividing by zero and destroying everything
code: Gas reactions now have access to where they are occurring
fix: Prevents some other reactions from producing matter from nothing
 2018-04-28 18:01:39 +12:00
oranges
85346cd5e4 Merge pull request #37497 from ExcessiveUseOfCobblestone/patch-42 
Replaces a / with * as per Contributing.md [bscrystal.dm]
 2018-04-28 14:20:58 +12:00
pigeons
c0b7f773dc Modified bomb and syndicate bomb spawner so Cuban Pete bombs maxcap and work again (#37293) 
fix: The faint echoes of maracas grows louder, as if a past spirit once forgotten has come back with a vengeance...
 2018-04-28 13:28:13 +12:00
kevinz000
19ce08f157 More integrated circuits and NTNET upgrade! (#37165) 
rscadd: Circuit ntnet components buffed. Added a new low level ntnet component that can send custom data instead of just the two plaintext and one passkey format, which things will use by default. Ntnet now uses a list for their data instead of three variables. they also have lowered complexity for the now weakened normal network component, and has lower cooldowns.
 2018-04-28 13:23:44 +12:00
oranges
ecd0d8b538 Merge pull request #37476 from AnturK/thisalwaysbuggedme 
Uppercases slot defines.
 2018-04-28 13:13:56 +12:00
ShizCalev
cda6c6662c Fixes a number of missing icons 2018-04-27 15:36:42 -04:00
ShizCalev
50af1c1865 Fixes bikehorn mood event 2018-04-27 15:31:35 -04:00
Grandmother of 50
14f26a1707 Replaces a / with * as per Contributing.md 2018-04-27 15:29:25 -04:00
Dax Dupont
354f843132 Adds logging for PDA explosions (#37465) 
* Adds logging for PDA explosions

* Adds antag status
 2018-04-27 21:10:23 +03:00
AnturK
52a99c09d6 Uppercase slot defines 2018-04-27 10:38:32 +02:00
AnturK
4c5a43eeb8 Prefix for item flag slot defines. 2018-04-27 10:30:48 +02:00
ShizCalev
df8d58bf66 Fixes missing augmentation hands (#37373) 2018-04-27 03:41:56 -04:00
MrDoomBringer
5ec8a18c74 Analyzers show temperature in Kelvin as well as Celsius now (#37441) 
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* wew

* nicbn
 2018-04-27 03:27:13 -04:00
Jordan Brown
cefaaff369 Merge pull request #37407 from Fox-McCloud/circuits-reagents 
Removes Acid from Remaining Circuits
 2018-04-26 16:23:31 -04:00
81Denton
849adf62d3 adds grind_results to coins and diamonds (#37403) 2018-04-25 07:04:06 -04:00
Dax Dupont
0de35f88bc Makes radiation collectors buildable (#37363) 
* Makes radiation collectors buildable

* capitalism at it's finest

* a
 2018-04-24 08:13:13 -04:00
Fox McCloud
3545973181 Removes Acid from Remaining Circuits 2018-04-24 05:34:17 -04:00
vuonojenmustaturska
0e38d316e5 Fixes missing icons (#37394) 2018-04-23 17:02:33 -04:00
Jordan Brown
0a28a839cf Merge pull request #37364 from Jalleo/Inducer_change 
Removes the ability for inducers and circuits to charge energy weapons.
 2018-04-23 09:49:03 -04:00
Jordan Brown
4fca080a0f Merge pull request #37381 from DaxDupont/toolbelts 
Fixes toolbelts holding everything
 2018-04-23 09:30:25 -04:00
Fox McCloud
057aa31cda Kills off /obj/item/device (#37297) 
* Kills off /obj/item/device

* whoops

* whoops

* Fix
 2018-04-23 15:00:23 +02:00
Dax Dupont
399de6b59c aww yee 2018-04-23 13:47:27 +02:00
Dax Dupont
85b1b99f35 Fixes toolbelts holding everything 2018-04-23 13:33:51 +02:00
iksyp
28e98a4d40 Gives beer and soda dispensers their own circuitboards and Design ID's (#37315) 
* new boards

* new boards installed

* new designs (wow) (woah)

* added the new design ids to the biotech node

* tested

it works, also, that typo fucking stopped it from compiling
 2018-04-22 20:20:06 -04:00
AnturK
f094192e34 Fixes falsewall letting through air. (#37306) 
* Fixes falsewall letting through air.

* define
 2018-04-22 20:16:18 -04:00
blah
0042b12379 What I get for commiting without doing a build check first 2018-04-22 14:09:09 +01:00
blah
97b52ed3d7 Fixes a power creep that occurred with two objects that weren't realised by the project lead/owner and needs reverting. 2018-04-22 14:02:27 +01:00
Dax Dupont
8cefe21ec4 You can no longer buckle anchored mobs to things. 2018-04-20 17:35:02 +02:00
pigeons
6135ec864f Refactors bitflag macro values into bitshifts (#37234) 
* Refactors bitflag values into bitshifts

* minor formatting edits

* Unbitshifts a macro set that skipped 3 for whatever reason
 2018-04-19 18:36:35 -04:00
ShizCalev
d77eb3df50 Adds new window spawners 2018-04-18 13:50:59 -05:00
vuonojenmustaturska
84c9c95c52 Makes welding tools (attempt to) flash you during progress (#37222) 
* There's no such thing as a free weld

* future proofing
 2018-04-16 20:21:28 -04:00
PKPenguin321
02f9740696 Esword cig lighting messages fix (#37216) 
* fix esword cig lighting message

`Jeb Ray swings their the energy sword. They light the cigarette in the process.` becomes `Jeb Ray swings their energy sword. They light their cigarette in the process.`

* fix desword cig lighting message

`Jeb Ray swings his the double-bladed energy sword (Wielded). he lights the cigarette in the process.` becomes `Jeb Ray swings their double-bladed energy sword (Wielded). They light their cigarette in the process.`

* check fix

* desword check fix

* suggested message replacement

* suggested message change desword
 2018-04-16 20:19:42 -04:00
Dax Dupont
efd69243e4 Fixes granters breaking on interrupt in final stage. (#37235) 
* Fixes granters breaking when interrupted in the final phase.

* Missed one
 2018-04-16 10:35:15 -05:00
AnturK
e1d9283c09 Fixes some defines. (#37223) 2018-04-16 16:32:05 +03:00
Grandmother of 50
d45a54348a Repeat of "I don't recall an arcade machine being th... GLORF (Chameleon Projector Change)" (#37141) 
* Update chameleonproj.dm

* Pseudo Lings need not apply

* Update chameleonproj.dm

* Update chameleonproj.dm
 2018-04-16 05:39:21 -04:00
John Ginnane
d434cac5b7 Sender of PDA messages is told when their message is sent (#37055) 
* Adds "sent message" to the sender of PDA messages

* Added span to message
 2018-04-14 17:13:52 -04:00
AnturK
66d9a4a0cf Removes /related area variable. (#37173) 
* Removes /related area variable.

* area_contents begone

* doorstuff
 2018-04-14 12:45:00 +03:00
ShizCalev
0606fcf417 grunge airlock 2018-04-13 09:05:41 -05:00
ShizCalev
8476e6e55e Fixes bad span class for cham projector warning (#37140) 2018-04-13 15:50:16 +03:00