cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-21 14:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,042 Commits 61 Branches 14 Tags
56ecfaff68e00a39b91c2b8c2c9ad1e593265815
Commit Graph

6448 Commits

Author SHA1 Message Date
KorPhaeron
56ecfaff68 Flip 2015-12-09 19:59:12 -06:00
Cheridan
da3eba756d Merge pull request #13463 from Incoming5643/a_placebo_effect 
Adds glowcaps
 2015-12-08 22:08:25 -06:00
duncathan salt
160d5428b8 Merge pull request #13474 from Shadowlight213/Aghost_control 
Allows admins to interact with most machines like an AI [Review Ready]
 2015-12-08 11:51:27 -06:00
duncathan salt
bea8d35ff5 Merge pull request #13437 from neersighted/clickable_stats 
Refactor MC/Failsafe/add Subsystems
 2015-12-07 19:58:46 -06:00
duncathan salt
0472592b97 Merge pull request #13327 from KorPhaeron/reactive 
check_shields() refactor
 2015-12-07 19:58:17 -06:00
Shadowlight213
71e76f6eec Merge branch 'master' of https://github.com/tgstation/-tg-station into Aghost_control 2015-12-07 13:10:53 -08:00
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
Shadowlight213
3c35ac809e Hopefully finally fixes the nanoui issue. 2015-12-06 23:24:01 -08:00
Shadowlight213
74c27189b9 Renames IsAGhost to IsAdminGhost. 
Reworks checks to not need stat to be 0
Fixes the majority of the Nanoui bugs.
 2015-12-06 20:21:43 -08: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
Jordie
45a9e138b2 Merge pull request #13435 from SuperSayu/window_unbreaker 
Fixes window fixing
 2015-12-06 12:06:37 +11: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
Incoming
7f3a1158d2 Adds glowcaps 
Glowcaps are red mutant glowshrooms. They can be used in all the same ways normal glowshrooms can, but they also boast a special feature.

When you finish eating a glowcap, the batteries of any electronics you have on/in you are recharged up to potency%.
 2015-12-05 03:35:23 -05:00
Bjorn Neergaard
34b717afb4 radio_controller -> SSradio, SSbp -> SSnpc 2015-12-04 22:25:24 -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
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
MrStonedOne
a5f0f3f594 changes spawn() throw_at to throw_at_fast set waitfor = 0 
Set waitfor = 0 has massively less overhead then spawn() but still does basically the same thing.

It causes the first sleep in the stack from that point on to make the set waitfor = 0 proc return . then continue on as if it was spawn()'ed, but it doesn't have to copy over the local vars of the proc so a lot less overhead

http://pastebin.com/kx538RqS
 2015-12-04 04:37:16 -08: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
Vincent
6f6968773b Fixes #13418 2015-12-03 22:46:56 -05: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
KorPhaeron
6be3a6fd58 Cleans up copypaste but this time it compiles 2015-11-30 16:50:17 -06:00
KorPhaeron
fab3cdc3a2 Cleans up copypaste, adds missing block chances 2015-11-30 16:39:02 -06:00
KorPhaeron
2609adb29d Blocking overhaul 2015-11-30 16:22:31 -06: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