cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 13:04:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,935 Commits 61 Branches 14 Tags
91c4d1bef862fb77cf00a30864737913f26c5729
Commit Graph

3958 Commits

Author SHA1 Message Date
Remie Richards
91c4d1bef8 Merge pull request #13440 from octareenroon91/patch-32 
Give wallets merged access of all IDs inside.
 2015-12-07 17:37:44 +00:00
Razharas
02fe4ec5a8 Merge pull request #13443 from MrStonedOne/DONTWAIT-IKNOWWHATYOURTHINKING-YOUDONTNEEDMYRETURN-DONTWAITCAUSEISLEEP 
changes `spawn() throw_at` to `throw_at_fast set waitfor = 0`
 2015-12-06 19:52:06 +03:00
octareenroon91
5646f0eb5b syntax error 2015-12-05 18:42:50 -06:00
MrStonedOne
9fa4288b08 Makes everything that used spawn () throw_at use throw_at_fast 2015-12-05 16:40:52 -08:00
octareenroon91
3c75d78f84 Use a list instead of net_id 
reduce excess calls to update_icon()
 2015-12-05 16:35:41 -06:00
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
octareenroon91
544295c563 define proc/refreshID 2015-12-04 03:42:54 -06:00
octareenroon91
f3f61367da Give wallets merged access of all IDs inside. 2015-12-04 03:16:43 -06:00
Razharas
3ea054e84c Merge pull request #13394 from octareenroon91/patch-31 
Correct crayon comment
 2015-12-03 23:10:55 +03: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
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
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
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
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
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
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
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
swankcookie
0b7b49d8c4 fixes issue of missing suit and hat in vendor 2015-11-28 03:11:05 -06:00
PKPenguin321
5382db940d adds mounted chainsaw inhands, repaths mounted chainsaws to actually use them, makes the lines for mounted chainsaws use tabs instead of filthy spaces 2015-11-27 14:56:23 -08:00
Remie Richards
b6209e4508 Merge pull request #13139 from AnturK/XXXFREEINSULATEDSWITHEVERYPURCHASEXXX 
Adds Send To All to Lawyer/Captain cartridges
 2015-11-27 20:58:03 +00:00
Remie Richards
f55246e5c0 Merge pull request #12987 from AnturK/turrets 
Removes gun_turret type and makes turret controls buildable
 2015-11-27 20:52:59 +00:00
Vincent
0218d51938 Better fireaxe-grill interactions 2015-11-27 15:38:37 -05:00
Remie Richards
62d301bfe5 Merge pull request #12998 from YotaXP/drone-fixes 
Allows drones to use 'pick up' and watertanks
 2015-11-27 20:38:23 +00:00
Bjorn Neergaard
5f108eef4e Merge remote-tracking branch 'tgstation/master' into nanoui_update 2015-11-27 15:31:35 -05:00
Bjorn Neergaard
b897fb6d72 Fix NanoUIs flashing, update Tanks, Solars, and Canisters 2015-11-27 15:30:18 -05:00
YotaXP
68dbc7cf27 Code formatting! 
Dat online PR editor.
 2015-11-27 15:18:16 -05:00
Remie Richards
fdede51a09 Merge pull request #12954 from MMMiracles/spookycaves 
New Away Mission: Caves
 2015-11-27 20:11:26 +00:00
PKPenguin321
cf29721672 fixes conflicts, adds the ability to remove the crystal from the prod via using it when no cell is attached 2015-11-26 18:28:12 -08:00