cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 17:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,184 Commits 61 Branches 14 Tags
3bcf8564effb2ccb052afdb0223856482884f2a7
Commit Graph

3983 Commits

Author SHA1 Message Date
Cheridan
6a9a5c820e Merge pull request #13560 from Incoming5643/and_as_the_sword_looked_upon_the_infinite_cosmos_it_knew_it_just_had_to_try_and_fuck_everything_up 
Supermatter swords and the infinite void
 2015-12-12 23:22:48 -06:00
Cheridan
c641643c55 Merge pull request #13539 from KorPhaeron/dance_moves 
Hitting someone with a dualsaber now has a chance to make you *flip
 2015-12-11 17:27:42 -06:00
Cheridan
78093c0bf0 Merge pull request #13556 from bgobandit/matsagainfuckina 
Adds mats/origin tech/burn_state to more items.
 2015-12-11 17:13:42 -06:00
Razharas
a251002d6f Merge pull request #13532 from Jalleo/pAI 
Personal Artificial Intelligence Fix
 2015-12-11 22:46:24 +03:00
Razharas
83bb88868c Merge pull request #13153 from Jordie0608/arguablyallgunsareenergygunsandallbeamsareprojectiles 
Unifies energy gun self charging
 2015-12-11 22:38:07 +03:00
Jordie0608
7719d8cb54 Merge branch 'master' of https://github.com/tgstation/-tg-station into arguablyallgunsareenergygunsandallbeamsareprojectiles 
Conflicts:
	code/modules/projectiles/guns/energy/laser.dm
 2015-12-11 15:59:46 +11:00
Incoming
8ee40a1518 supermatter now reduces turf to base turf, and checks for base turf instead of space. 
(in most settings, base turf IS space)
 2015-12-10 19:46:35 -05:00
Incoming
a05e29b27e Supermatter swords can no longer consume space itself to spam radiation at people. 2015-12-10 17:13:40 -05:00
bgobandit
984582f6ba tweaks and shit 2015-12-10 15:48:22 -05:00
bgobandit
92d86dd369 Adds mats/origintech/burn_state to more items. 2015-12-10 15:32:28 -05:00
blah
844b10fa33 Whoops I left a debug 2015-12-10 14:42:43 +00:00
blah
acf95ccfd9 Fixes the pAI and removes the .gitignore issue that I caused from other stuff 2015-12-10 14:40:04 +00:00
KorPhaeron
50e4e77250 Fixes UI stuff 2015-12-09 21:37:18 -06:00
KorPhaeron
56ecfaff68 Flip 2015-12-09 19:59:12 -06:00
blah
5fff63d62c Changes pAI to have hearable_message() rather than visible_message() as that doesn’t work from inside objects 2015-12-09 20:04:54 +00: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
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
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
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
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
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
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