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

22062 Commits

Author SHA1 Message Date
Jordan Brown
40fbd57c85 Merge pull request #37593 from optimumtact/revertarmshit 
Revert "fixes a pacifism kill through crushing firelocks! (#37511)"
 2018-04-30 22:20:52 -04:00
Jordan Brown
61ed68053a Merge pull request #37560 from AutomaticFrenzy/patch/terminate-maintenace-protocols 
Fix mecha maintenance protocol button always saying Initiate
 2018-04-30 22:19:45 -04:00
Jordan Brown
8ce7d19c9c Merge pull request #37565 from ninjanomnom/component-limbo 
Modifies component transfer to make ChangeTurf able to transfer components
 2018-04-30 22:16:47 -04:00
Jordan Brown
d132f97061 Merge pull request #37568 from pigeonsk/removeenruranium 
Removes enriched uranium
 2018-04-30 22:16:02 -04:00
oranges
9465eb5130 Revert "fixes a pacifism kill through crushing firelocks! (#37511)" 
This reverts commit 41eb3276fb.
 2018-04-30 22:02:50 +00:00
Jordan Brown
2a2ad8fd79 Merge pull request #37549 from ShizCalev/bounce_away-fixes 
Resolved var name conflict for bounce_away()
 2018-04-30 13:52:52 -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
ShizCalev
ac2967fa66 Moved to vars 2018-04-30 01:20:37 -04:00
george99g
f28092423a Deactivate suicide prescans via ghost var (#36839) 
* Create suicide_log proc in /mob/living

Suicide logging moved to there.

* Stop after-suicide prescan clones
 2018-04-30 14:35:00 +12: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
erwgd
d988406583 added fly and moth categories to limb grower and limbgrower_designs.dm (#37349) 
only human and lizard synthetic limbs will have should_draw_greyscale set to true

added /improper and uncapitalised synthetic limb names

removed plasmaman parts from human_parts_greyscale.dmi
 2018-04-30 10:53:42 +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
ninjanomnom
5028239b35 Modifies the component transfer to make ChangeTurf work 2018-04-29 18:11:02 -04:00
Tad Hardesty
9f3b9a0ae3 Fix mecha maintenance protocol button always saying Initiate 2018-04-29 13:16:17 -07:00
Armhulen
41eb3276fb fixes a pacifism kill through crushing firelocks! (#37511) 
* fix!

* ORANGES LOOK AWAY

* thanks maintainer
 2018-04-29 11:10:59 -04:00
ShizCalev
0bcdc963c1 Resolved var name conflict for bounce_away() 2018-04-29 09:59:13 -04: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
81Denton
f41d77063b fixes obj descs and adds new ones (#37483) 2018-04-27 21:20:55 +03:00
kevinz000
421be945d4 Quantum pad interaction (#37473) 2018-04-27 21:17:41 +03:00
Dax Dupont
52a7ebcbff Refactors and fixes RPEDs (#37380) 
* Refactors and fixes RPEDs

* Fixes storage related memes

* beams should probably always play
 2018-04-27 21:12:41 +03:00
ShizCalev
f540fe8500 Fixes turret exploits (#37478) 2018-04-27 21:11:08 +03: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
vuonojenmustaturska
640f2cf693 Adds a stationloving component to replace a couple of flags and SSinbounds with (#37436) 
* station lovin' happened so fast

* Update stationloving.dm

* less qdel memes

* imbue soul signal

* rename imbue soul signal

* dupemode

* henk

* Update atoms_movable.dm

* Update nuclearbomb.dm

* Update nuclearbomb.dm
 2018-04-27 14:35:53 +02: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
Armhulen
ca273db3f0 Removes SCP_294 (#37326) 
* aaah sweet essence

* bye bye sprites

* goodbye machine code

* bye bye blacklist entry

* whoops

* scp gone from runtime

* bye bye ract

* bye bye space ruin folder

* bye bye area
 2018-04-26 03:05:41 +12: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