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

12410 Commits

Author SHA1 Message Date
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
58a3f742c6 Spawnable hostile constructs, for away missions and adminfuckery. 2015-12-05 10:48:52 -05: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
Razharas
0ccbe76a7a Merge pull request #13402 from AnturK/pressme 
Minor button upgrades
 2015-12-04 22:21:48 +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
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
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
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
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
Cheridan
26c040b274 Merge pull request #13328 from YotaXP/space-heater-love 
Upgrades the space heater
 2015-12-03 11:01:10 -06:00
AnturK
7a34287a7d Fixes shadowling hatch 2015-12-03 12:00:55 +01:00
MMMiracles
6b0976afcb updates caves.dm to use the actual basalt asteroid flooring, removes plating variant. 2015-12-03 01:00:43 -05:00
MMMiracles
11c26fb328 updates to use real basalt tiles, removes the shitty plating ones 2015-12-03 00:57:21 -05: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
Jordie
4705037955 Merge pull request #13358 from neersighted/map_name 
Add map_name to areas
 2015-12-03 14:18:34 +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
08a8115790 Merge pull request #13271 from KorPhaeron/new_mining_turfs 
New mining turf sprites
 2015-12-02 18:11:46 -06:00
AnturK
056dfe51f3 Makes buttons work on away missions 
Makes spawned buttons simplier to use
 2015-12-02 23:55:42 +01: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
29d1684757 Merge pull request #13343 from GunHog/L2TestNoob 
Fixes inability to upgrade gun rechargers
 2015-12-02 14:16:34 +00: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
Jordie
ae54bedc30 Merge pull request #13345 from neersighted/sstimer_lovin 
Fix up SStimer, make Crew Console use SStimer
 2015-12-02 15:53:53 +11: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
Incoming5643
091acb5b6e Removes the |~| string work around, as apparently the problem it was fixing doesn't actually exist. 2015-12-01 11:41:40 -05:00
Bjorn Neergaard
c36b70afe0 Fix up comments 2015-12-01 10:37:37 -06:00
Bjorn Neergaard
8cc3a856a2 Add map_name to areas 
Fixes #12713
 2015-12-01 10:03:03 -06:00
Incoming5643
8df0899f57 I don't think this is actually needed for whatever reason, but lets be safe. 2015-12-01 03:12:55 -05:00
Incoming
716ed77501 Changes up how OOC checks to see that you agreed that a message isn't accidental IC. 
It now passes a special string, "|~|", in front of your message and runs it through OOC again. The string saves the message from further scrutiny, and is then cut off.
 2015-12-01 03:07:34 -05:00
Bjorn Neergaard
6f098e8298 Allow ghosts to use any NanoUI interface. 2015-11-30 23:34:59 -05:00
Bjorn Neergaard
47e9a7771a Fix up SStimer, make Crew Console use SStimer 
Remove crappy proc queue as well...
 2015-11-30 20:56:45 -05:00
GunHog
c09b880fa4 Fixes inability to upgrade gun rechargers 
Adds missing exchange_parts() proc
 2015-11-30 19:54:41 -06: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