cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-28 10:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,969 Commits 61 Branches 14 Tags
a01eda01e11d0fe1682b7a2a4dcd8be92cff9607
Commit Graph

18426 Commits

Author SHA1 Message Date
Leo
eaab4f5012 Merge pull request #25206 from octareenroon91/patch-39 
Fix ecig chem consumption
 2017-03-18 15:26:02 -03:00
AnturK
d61dc54d17 Abductor fixups (#25210) 2017-03-18 14:44:10 -03:00
Leo
4f95a168ce Merge pull request #25201 from ChangelingRain/sayhowmuch 
Proselytizers now say how much brass sheets cost to make on examine
 2017-03-18 14:24:09 -03:00
Jordie
d15859dc17 Merge pull request #25188 from lzimann/ivdrips 
Fixes a potential runtime with iv drips, also adds mouse_drag_pointer for it
 2017-03-19 01:54:52 +11:00
MrPerson
2394b4ce7c More lighting fixes for white space and black tiles (#25229) 
* More lighting fixes for white space and black tiles
 2017-03-18 09:42:50 -03:00
Leo
092cf72835 Merge pull request #25186 from coiax/fixes-post-nuke-all-clear 
The alert level is no longer lowered by a nuke's detonation
 2017-03-17 21:49:52 -03:00
Cheridan
9659981dba Merge pull request #25183 from ExcessiveUseOfCobblestone/somethingwithgulagbutiforgot 
Does some more theorycrafting with gulag minerals
 2017-03-17 18:20:11 -05:00
Cheridan
44b6e31725 Merge pull request #25181 from lzimann/orm 
Refactors ORM code
 2017-03-17 17:28:42 -05:00
Cheridan
46da9d2b81 Merge pull request #25011 from PKPenguin321/flashdark 
Adds flashdarks
 2017-03-17 17:09:27 -05:00
Cheridan
544b41e1e5 Merge pull request #25180 from ExcessiveUseOfCobblestone/penoriented 
THIS STUPID PEN PR FINALLY IS FINISHED GAH
 2017-03-17 17:04:53 -05:00
Leo
cceb50a932 Fixes a runtime when a ling tries to absorb a person that never spoke anything (#25185) 2017-03-17 16:24:51 -04:00
Cheridan
ecbda60833 Merge pull request #25150 from Iamgoofball/planet_station 
Planetstation: Build over chasms
 2017-03-17 15:04:38 -05:00
Lzimann
cb4b9a91c6 Requests console now have a receive ore updates variable. 
Also updates all maps with it.
 2017-03-17 15:04:00 -03:00
octareenroon91
6384b1a240 Update cigs_lighters.dm 
Cause cigs/ecigs to consume chemicals whether or not the owner can absorb them.
 2017-03-17 12:08:48 -05:00
Joan Lung
b8828c3991 Proselytizers now say how much brass sheets cost to make on examine 2017-03-17 11:55:14 -04:00
Leo
5aeb4d7a87 Merge pull request #25168 from ChangelingRain/wizarddenfix 
The Wizard's Den now has dynamic lighting
 2017-03-17 12:37:13 -03:00
Joan Lung
58216c4189 Merge pull request #25192 from MrPerson/no_more_reverts_this_pull_request_has_a_family 
Fixes non-dynamically lit areas being pitch black
 2017-03-17 11:07:15 -04:00
Xhuis
764ec63713 Adds the power flow control console (#25001) 
* Adds the power flow control console

* Minor cleanup

* Adds some new stuff

* Tweaks sounds

* Added access requirements, admin logging, AI restriction

* Part 1: Remove dem consoles

* Put dem consoles back

* Small patch

* Some work I can't remember

* Sanity checkin'

* Maybe now!

* Sanity checks pass 3295912

* Sanity checks
 2017-03-17 15:57:56 +01:00
Cyberboss
ca070c5efa Fixes being able to move certain spawnpoints (#25135) 2017-03-17 15:03:15 +01:00
MrPerson
b71e89ce10 Fixes non-dynamically lit areas being pitch black 
Fixes #25179 (Legitimate closing of a pull request, thanks for this bug github)
Fixes #25164
 2017-03-16 21:30:06 -07:00
Iamgoofball
099c822b7c RCD refactor (#25154) 
* Refactors RCD code
 2017-03-17 00:22:22 -03:00
Lzimann
36a6b79178 Fixes a potential runtime with ivdrips, also adds a mouse_drag_pointer to it 2017-03-16 22:15:05 -03:00
Joan Lung
5917e1ffae You can now place lights on shuttles (#25142) 
* You can now place lights on shuttles

* apcs don't go there

* this should really be a proper decon
 2017-03-16 19:18:25 -05:00
Jack Edge
85bf6921bc The alert level is no longer lowered by a nuke's detonation 
🆑 coiax
fix: The alert level is no longer lowered by a nuke's detonation.
/🆑

Stops the post nuke "Red Alert".
 2017-03-16 23:23:56 +00:00
ExcessiveUseOfCobblestone
bec449b127 plays with numbers... again 2017-03-16 18:55:47 -04:00
ExcessiveUseOfCobblestone
7b34c5e20f AFTER A MILLENIA 2017-03-16 18:15:33 -04:00
Joan Lung
743653e88a Cult structures now have colored light (#25116) 2017-03-16 16:54:46 -03:00
Joan Lung
1579256ffd The Wizard's Den now has dynamic lighting 2017-03-16 09:46:14 -04:00
Joan Lung
0cf2e02bb6 Red and green energy swords have much less saturated light colors (#25118) 2017-03-16 20:25:51 +13:00
Cyberboss
a09e76285d Fixes the slow leak in arrivals (#25074) 
* Fixes the slow leak in arrivals

* ree src
 2017-03-16 20:19:37 +13:00
Mr Potato Shaman
ed3131af57 Adjusts range of fabrator sync (#25097) 2017-03-16 20:17:47 +13:00
Cyberboss
8d3aac8ce2 Fixes a case where radios can fail to GC (#25105) 2017-03-16 20:17:17 +13:00
Cyberboss
84047ec478 Cleans up some vintage shitcode (#25106) 2017-03-16 20:16:49 +13:00
Cheridan
0c31ddf707 Merge pull request #25046 from MrPerson/revert_revert_revert_come_on_revert_please_revert_please_shit_REVERT_JESUS_TAPDANCING_CHRIST_REVERT_YOU_FUCKING_PIECE_OF_GODDAMN_PISS 
Readds ability for humans to see themselves in darkness
 2017-03-15 21:28:10 -05:00
Cheridan
6d712a436f Merge pull request #25107 from Cyberboss/patch-34 
Cleans up some stuff with request consoles
 2017-03-15 21:17:06 -05:00
MrPerson
db34a1f2be Merge branch 'master' of https://github.com/tgstation/-tg-station into revert_revert_revert_come_on_revert_please_rever_please_shit_REVERT_JESUS_TAPDANCING_CHRIST_REVERT_YOU_FUCKING_PIECE_OF_GODDAMN_PISS 
Conflicts:
	code/_onclick/hud/plane_master.dm
	code/modules/lighting/lighting_object.dm
 2017-03-15 18:53:09 -07:00
iamgoofball
0756a572f2 Planetstation: Build over chasms 2017-03-15 17:45:46 -07:00
oranges
9aaff6e281 Fixes sinks giving misleading messages when containers full (#25037) 
* Sinks will now give a message when the reagent holder is full

This also adds a helpful proc to check a reagent holder is full

* It was one character
 2017-03-15 16:38:33 -04:00
anconfuzedrock
f8c244dd8c replaces flashlights in hacked assistvend thingy with flashlights in regular toolvend #24907 2017-03-16 09:34:30 +13:00
Tokiko1
bf85ff2327 Adds new gas interactions to supermatter, new minor and major failures and rebalances (#24785) 
* Adds new gas interactions to supermatter.
Adds new minor and major failures to supermatter.
Adds highpressure windows to box.

* Shard now announces critical power and critical mass.

* Balance adjustments, some test stuff.

* Higher mole hot setups now scale in damage because they are harder to heat. Low mole setups, like the roundstart shard now cause less damage because they heat up smaller amounts of gas faster.

Actually made windows heat resistant now.

The supermatter crystal now takes damage from heat much earlier.

* Testing and tweaking more stuff.
Added tesla_zap proc.
Added anomaly generation.
Added occasional gravity pull in.

* Fixes anomaly spawner, hopefully fixes lightning bolts.

* Fixes supermatter lightning. Tweaks and balances some more values.

* Resolves conflicts for real now.

* Adds high pressure windows to the supermatter in box, meta and delta.
Fixed supermatter shutter button requiring atmos id on box and meta.
Readded the missing electrical supplies and welding locker to engineering of metastation.
Fixed stuff for travis.

* More balancing and behaviour changes.

* Adds heat_resistance to windows so windows can now survive more than TOC+1600 K if desired.
Also makes high pressure windows able to withstand 50000° K.

* More overcharge tweaks.

* Makes stuff compile and removes extra whitespaces.

* Even more tweaks.

* Rebalances power increase from matter, removes mass paper radiation exploits. Nerfs plasma. Removes mapchanges for the time being.

* Adds high pressure windows to the supermatter engine in box, meta and delta.

* Merge conflicts.

* Requested changes.

* Fixes supermatter zap overriding src.

* Fixes message timing.
 2017-03-15 16:23:56 -04:00
oranges
c36f169152 Merge pull request #25057 from AnturK/bumpthis 
Fixes bump order
 2017-03-16 09:23:40 +13:00
octareenroon91
c4d42e8a8a Allow reflector construction (#25084) 
New reflector frames can now be built at will.
 2017-03-14 20:46:56 -04:00
Cyberboss
a2ddba07d9 Kills a spawn (#25109) 2017-03-14 20:43:55 -04:00
Cyberboss
6688af1523 Fixes more missing qdel hints (#25110) 2017-03-14 20:42:04 -04:00
Cyberboss
c99b0aa6ef Fixes pinpointers failing to GC (#25104) 2017-03-14 20:41:49 -04:00
Joan Lung
bfb46b2972 Proselytizers converting clockwork floors to walls now always take 10 seconds (#25071) 2017-03-14 16:18:08 -04:00
Joan Lung
b81d5f1f66 Clockwork grilles no longer provide CV (#25072) 2017-03-14 16:15:30 -04:00
Cyberboss
5509c8e51e Fix a missing qdel hint (#25108) 2017-03-14 16:15:04 -04:00
Cyberboss
cbe1382da5 Cleans up some stuff with request consoles 2017-03-14 14:54:04 -04:00
Cyberboss
fdab11f6c2 Fix a missing qdel hint (#25103) 2017-03-14 14:35:56 -04:00