cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 00:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,931 Commits 61 Branches 14 Tags
2ea50e063b0d7eb8240e1d94e9b17eeee2fa1b67
Commit Graph

21509 Commits

Author SHA1 Message Date
GunHog
2ea50e063b Adds Diagnostic HUD to ghosts 
- Ghosts may now use Diagnostic HUD.
- Feedback added for which HUD is active.
 2015-12-06 19:15:26 -06:00
duncathan salt
9ec6e187a4 Merge pull request #13464 from Anonus/hostileconstructs 
Spawnable hostile constructs, for away missions and adminfuckery
 2015-12-06 17:25:53 -06:00
Nerd Lord
01b12caec8 obey the dunc 2015-12-06 17:41:27 -05:00
Kyle Spier-Swenson
88a795a0c6 fixes typo in is banned() 2015-12-06 12:54:36 -08:00
Kyle Spier-Swenson
0d55edc2b0 Hot fix for stickybans going hey wire 2015-12-06 12:20:12 -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
Razharas
5ed60c2052 Merge pull request #13452 from KorPhaeron/too_many_ghosts 
Revenant event can only occur once per round
 2015-12-06 17:21:05 +03:00
Jordie
c018b514d2 Merge pull request #13401 from GunHog/Of_Bots_And_Diagnostic_HUDs 
Adds Bots to Diagnostic HUDs
 2015-12-06 17:19:56 +11:00
Jordie
33d749fa62 Merge pull request #13398 from AnturK/morebotfix 
More Bot Fixes
 2015-12-06 17:13:10 +11:00
Jordie
d49bd5b487 Merge pull request #13438 from neersighted/cryo_alarm 
Fix Cryo checks
 2015-12-06 17:11:20 +11:00
Jordie
43cf0d52a7 Merge pull request #13432 from MMMiracles/SHIFTCLICKNOTMIDDLECLICKYOUFUCK 
Morphs SHIFT-CLICK not MIDDLE-CLICK
 2015-12-06 17:07:39 +11:00
Jordie
c7dfcddc15 Merge pull request #13422 from tkdrg/a 
Fixes APC emp_act
 2015-12-06 17:06:34 +11:00
Jordie
45a9e138b2 Merge pull request #13435 from SuperSayu/window_unbreaker 
Fixes window fixing
 2015-12-06 12:06:37 +11:00
MrStonedOne
9fa4288b08 Makes everything that used spawn () throw_at use throw_at_fast 2015-12-05 16:40:52 -08:00
Nerd Lord
b9bd386a3e coughing noise, comma comes out 2015-12-05 19:18:58 -05:00
Nerd Lord
a0b2b0a721 Couple of small fixes. 
thou shalt not flee the will of nar-sie
 2015-12-05 19:09:21 -05:00
Nerd Lord
953f175d2e Hostile mobs don't get a target if the damage dealt is 0 or less. 2015-12-05 10:58:08 -05:00
Nerd Lord
58a3f742c6 Spawnable hostile constructs, for away missions and adminfuckery. 2015-12-05 10:48:52 -05:00
Aranclanos
249a43bb08 Merge pull request #13399 from tgstation/duncathan-patch-1 
removes unused gas mixture code
 2015-12-04 21:05:35 -03:00
KorPhaeron
3de101ff04 One revenant per round 2015-12-04 16:44: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
b888cb8333 Merge pull request #13427 from Anonus/vineathon2015 
Vine fixes and tweaks
 2015-12-04 21:40:33 +00:00
Nerd Lord
7560562269 Well okay SHORT delay then 2015-12-04 16:32:41 -05:00
Razharas
0ccbe76a7a Merge pull request #13402 from AnturK/pressme 
Minor button upgrades
 2015-12-04 22:21:48 +03:00
Razharas
d4395f6122 Merge pull request #13419 from neersighted/sstimer_fix 
Fix error in SStimer arguments
 2015-12-04 21:57:47 +03:00
Razharas
7037877028 Merge pull request #13420 from AnturK/outofideas 
Removes unused virus var
 2015-12-04 21:57:24 +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
Remie Richards
7469ed2263 Merge pull request #13403 from Anonus/mmnerf 
Magic missile no longer does damage
 2015-12-04 15:57:37 +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
Razharas
c1ad583a30 Merge branch 'master' of https://github.com/tgstation/-tg-station 2015-12-04 11:38:56 +03:00
Razharas
b4ddc0abb3 Merge branch 'madewithrealcaverock' of https://github.com/MMMiracles/-tg-station into MMMiracles-madewithrealcaverock 2015-12-04 11:17:49 +03:00
paprka
717b857401 Merge branch 'BeamVines' of https://github.com/RemieRichards/-tg-station into remiepls 
Conflicts:
	code/datums/beam.dm
	icons/mob/animal.dmi
	tgstation.dme
 2015-12-03 23:20:12 -08:00
Bjorn Neergaard
bfdaf453b0 Fix Cryo checks 
Derp
 2015-12-04 00:31:43 -05:00
Vincent
6f6968773b Fixes #13418 2015-12-03 22:46:56 -05:00
MMMiracles
9add2c776e oy vey 2015-12-03 19:44:20 -05:00
duncathan salt
2d9fae5071 Merge pull request #13428 from neersighted/ai_nano_fix 
Fix AI NanoUI checks
 2015-12-03 16:44:18 -06:00
duncathan salt
6953de304f Merge pull request #13429 from KorPhaeron/new_mining_turfs 
Fixes the pre-mapped cave pieces to spawn the right tiles
 2015-12-03 16:17:17 -06:00
KorPhaeron
b8909aa814 Fixes the pre-mapped cave pieces to spawn the right tiles 2015-12-03 16:07:00 -06:00
Remie Richards
497208ec28 Merge pull request #13386 from neersighted/chem_love 
Add remove buttons directly to Chem Dispenser
 2015-12-03 21:59:12 +00:00
Remie Richards
fbe6c9550d Merge pull request #13384 from neersighted/pull_release 
Make Ctrl-Click unpull work by using the verb
 2015-12-03 21:56:17 +00:00
Bjorn Neergaard
a004c0048e Fix AI NanoUI checks 
view() is broken...
 2015-12-03 15:53:27 -06:00
Remie Richards
93ebd07488 Merge pull request #13426 from KorPhaeron/new_mining_turfs 
Mine turf fixes
 2015-12-03 21:49:40 +00:00
Cheridan
3cf6dc50be Merge pull request #13414 from AnturK/shadowlingfix 
Fixes shadowling hatch
 2015-12-03 15:35:46 -06:00
MMMiracles
7eab9a3f76 so smooth it burns 2015-12-03 16:12:56 -05:00
MMMiracles
fdcfbb9b9d Merge branch 'master' of https://github.com/tgstation/-tg-station into madewithrealcaverock 2015-12-03 16:07:07 -05:00
Bjorn Neergaard
cca05646e8 Auto-populate dispenser buttons, fix a couple warts 2015-12-03 15:01:22 -06:00
Nerd Lord
a2b8d1eb2a Vine fixes and tweaks. 2015-12-03 15:48:47 -05:00
Bjorn Neergaard
9c997c2be0 Make remove buttons for whole beaker, not individual chems 
Also re-arrange chemistry because that crap is whack...
Also, clean up chemistry code's variables...
Death to colons!
 2015-12-03 14:33:28 -06:00
KorPhaeron
0e4078fb90 Mine turf fixes 2015-12-03 14:25:38 -06:00
Razharas
31989e9197 Merge pull request #13350 from Incoming5643/colon_cancer 
IC OOC detection fixes
 2015-12-03 23:12:25 +03:00