cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 09:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,896 Commits 61 Branches 14 Tags
a0b2b0a72113eaba91f59cdce76acbd18fdbe1c8
Commit Graph

6425 Commits

Author SHA1 Message Date
Razharas
41341461b0 Merge pull request #13393 from kingofkosmos/fewinhandsprites 
In-hand sprites: transfer tank valve, tracking beacon, pizza box & carp plushie
 2015-12-05 01:14:20 +03:00
Remie Richards
87976c358f Merge pull request #13411 from Anonus/ghostexamine 
Removes delay on examining objects that also have a nanoui interface as a ghost
 2015-12-04 15:58:19 +00:00
Razharas
3ea054e84c Merge pull request #13394 from octareenroon91/patch-31 
Correct crayon comment
 2015-12-03 23:10:55 +03:00
Cheridan
9c7ff23609 Merge pull request #13333 from MrStonedOne/lightingtweaks 
Lighting system tweaks. Fixes low lum items having full center brightness, etc.
 2015-12-03 13:40:23 -06:00
Cheridan
a3c6f5ad59 Merge pull request #13385 from spudboy555/librarian_pda 
Moved Librarian PDA a few pixels to the left.
 2015-12-03 11:48:18 -06:00
Nerd Lord
3a96d9bd8c No delay on examining objects with a nanoui interface as a ghost 2015-12-02 22:53:33 -05:00
Jordie
bfe4d41554 Merge pull request #13408 from neersighted/hotfix 
Hotfix for SStimer lag
 2015-12-03 14:34:45 +11:00
Bjorn Neergaard
6ec257c360 Hotfix for SStimer lag 
SStimer can now check dupes
Also fix ghosts not being inquisitive with objects...
 2015-12-02 21:23:45 -05:00
Cheridan
dd768b9046 Merge pull request #13369 from neersighted/caps 
Capitals for Tank logging
 2015-12-02 19:09:30 -06:00
Cheridan
f634890457 Merge pull request #13335 from Incoming5643/fudge_dice 
Fudge dice
 2015-12-02 16:40:25 -06:00
spudboy555
f4fb0f2886 Fixed the message alert on the librarian's PDA. 2015-12-02 13:33:41 -08:00
duncathan salt
fd5423e0cc Merge pull request #13340 from KorPhaeron/oxy_tank 
Internals start at 16 pressure
 2015-12-02 14:16:29 -06:00
octareenroon91
3693759187 Correct crayon comment 
For /obj/item/toy/crayon , uses == 0 means a mundane crayon has been used up.
Uses < 0 implies unlimited uses.
 2015-12-02 11:38:38 -06:00
MrStonedOne
a1bfb37f0c Tweaks lighting some more. 
This should be ready to go.
 2015-12-02 07:12:37 -08:00
Remie Richards
d909c1e82d Merge pull request #13348 from neersighted/spooky_nanoui 
Allow ghosts to use any NanoUI interface.
 2015-12-02 14:15:33 +00:00
kingofkosmos
0b1aa47adc Adds in-hand sprite to transfer tank valve. 2015-12-02 06:23:55 +02:00
kingofkosmos
ee522d61d7 Merge branch 'master' of https://github.com/tgstation/-tg-station into fewinhandsprites 2015-12-02 06:05:40 +02:00
Bjorn Neergaard
b7ad1452ed Caps for Tank logging 2015-12-01 18:48:35 -05:00
duncathan salt
d616885241 Merge pull request #13338 from Incoming5643/tis_the_season_for_horrible_manual_placement 
[Touching all the maps oh god] The reason for the season
 2015-12-01 15:15:49 -06:00
Vincent
bf530cc3dd Fixes untouchable windows 
Sorry about that.  Fixes #13354
 2015-12-01 11:54:09 -05:00
Bjorn Neergaard
6f098e8298 Allow ghosts to use any NanoUI interface. 2015-11-30 23:34:59 -05:00
Vincent
16303c1c1f Changes flag name from ABSTRACT to NODECONSTRUCT 
Removes holo-tables and holo-windows since those typepaths are no longer needed.
Updates Z2 to reflect this.  Removes spurious tag tags in Z2.
 2015-11-30 20:26:03 -05:00
Incoming
42da16a003 adds swankcookie's snowman stuff to the gifts that will spawn on christmas should the trees exist which hopefully they will! 2015-11-30 19:21:53 -05:00
KorPhaeron
c29f2ef837 Internals start at 16 pressure 2015-11-30 18:12:32 -06:00
Vincent
b31b5e3f77 Fix Conflicts: 
code/game/machinery/doors/windowdoor.dm
 2015-11-30 18:56:43 -05:00
Incoming
d8f6039834 Accidental remnant of another pull got in 2015-11-30 15:22:58 -05:00
Incoming
0c1d7272d5 Adds fudge dice 
They're six sided dice with two pluses, two minusii, and two blank sides.

They're also a jokey recipe you can create with any dice and a chocolate bar. Once you eat the literal fudge die you get a fudge die no matter what kind of die you used into its creation. This is INTENTIONAL AND PART OF THE JOKE.

Adds them to the "rare dice" spawn in dice bags.

Formally defines a d6 as a separate thing from the generic parent die. the generic parent die is still a d6 for all intents and purposes except for the fact that it's now just called a generic "die" instead of a d6. This was so the recipe didn't list a d6 as needed for the fudge dice recipe when really any die would do.

Doesn't replace existent generic die with d6eses on the maps because I don't want this to conflict for a million years. I'll swap out the generic dies at some future point after this is added.
 2015-11-30 15:19:25 -05:00
Razharas
78c95ab035 Merge pull request #13317 from neersighted/airlock_electronics 
NanoUI Airlock Electronics
 2015-11-30 20:43:33 +03:00
duncathan salt
ad410e39d8 Merge pull request #13296 from neersighted/nanoui_checks 
Fix some NanoUI checks
 2015-11-29 18:36:18 -06:00
Vincent
05ae680b06 Fixing conflicts: 
code/game/machinery/computer/computer.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/objects/structures/window.dm
 2015-11-29 19:02:30 -05:00
Bjorn Neergaard
06e5df9336 Fix NanoUI missing assignment; use two-line ifs 2015-11-29 18:20:10 -05:00
duncathan salt
aa7df92150 Merge pull request #13282 from Anonus/fluxfix 
Fixes flux and gravitational anomalies not shocking nondense mobs
 2015-11-29 12:35:30 -06:00
duncathan salt
9e9ccf9474 Merge pull request #13268 from Anonus/teachingsofnarsie 
Cult theme update
 2015-11-29 12:23:07 -06:00
Bjorn Neergaard
f214e547cb NanoUI Airlock Electronics 
Also reworks a lot of the AE code.
 2015-11-29 11:32:56 -06:00
kingofkosmos
edb611f53d Adds in-hand sprites for tracking beacon, pizza box and carp plushie. 2015-11-29 16:43:52 +02:00
Jordie
e9ea0d8dc9 Merge pull request #13275 from swankcookie/snowman 
Adds Snowman costume
 2015-11-29 21:08:11 +11:00
Jordie
38eddb1421 Merge pull request #13179 from AnturK/academy 
Wizard Academy Away Update
 2015-11-29 21:06:34 +11:00
Jordie
da0c466f82 Merge pull request #13149 from Firecage/toolspeed 
Adds toolspeed
 2015-11-29 21:06:15 +11:00
Jordie
06134d5f19 Merge pull request #13104 from GunHog/OfTeleportsAndNames 
Hand Tele now displays its destination.
 2015-11-29 21:06:01 +11:00
Jordie
ee3e5c4d3f Merge pull request #13074 from Yolopanther12/lightReplacerUpgrade 
Adds Light Replacer Refilling With Box of Lights
 2015-11-29 21:04:43 +11:00
Cheridan
2abaa2b0f1 Merge pull request #13045 from KorPhaeron/laserbox 
Fixes reflector structure being on a low layer
 2015-11-28 20:42:21 -06:00
KorPhaeron
4245481019 Lower layer but still higher than it was 2015-11-28 18:48:42 -06:00
PKPenguin321
8e09b00f2c Merged upstream 2015-11-28 15:49:41 -08:00
Cheridan
2fc49bbcad Merge pull request #13265 from PKPenguin321/kor-you-lazy-fuck 
Mounted Chainsaw Inhands 2.0
 2015-11-28 17:01:35 -06:00
PKPenguin321
36d92b8c2d fixes everything 
i broke everything by giving teleprods a unique attack_self but forgetting to include the original functions of attack_self, making them unable to turn on/off. this fixes that.
 2015-11-28 14:57:36 -08:00
AnturK
9a434b669c Academy Fixes 2015-11-28 23:17:57 +01:00
Nerd Lord
33e6fe073e Cross() isn't called anywhere even though it might be useful! workarounds! 2015-11-28 12:49:44 -05:00
Nerd Lord
98e3cdeabd Fixes flux and gravitational anomalies sometimes not shocking mobs. 2015-11-28 12:41:28 -05:00
AnturK
b662b470a9 Enables ghost to go through ladders 
Adds Cold snow turf
Adds Infinite Candles
 2015-11-28 18:14:52 +01:00
Razharas
e715e1cc57 Merge pull request #13195 from neersighted/nanoui_update 
[WIP|DNM] Update NanoUI
 2015-11-28 14:17:49 +03:00