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

250 Commits

Author SHA1 Message Date
Razharas
9ee8faea73 Merge pull request #12552 from KorPhaeron/disposals 
Click dragging mobs into disposals
 2015-11-07 06:16:41 +03:00
kingofkosmos
e75d24a6c9 Changes checks in altclicks from canusetopic to incapacitated. 2015-11-01 11:24:17 +02:00
KorPhaeron
2c3f54cc2e Xenobio fix 2015-10-25 17:59:05 -05:00
KorPhaeron
de67be73af Turf check 2015-10-25 17:51:38 -05:00
KorPhaeron
7db1d6792f Disposals 2015-10-20 23:06:11 -05:00
phil235
a311e7a739 Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeFeedBuckling 
Conflicts:
	code/game/objects/structures/janicart.dm
 2015-10-12 22:01:57 +02:00
phil235
df171284cb Slimes now uses buckling to feed and attach themselves on mobs. This removes the silly check in mob/Move(), reducing lag. 
Fixes mobs being able to attach slimes onto other mobs.
 2015-10-10 20:41:27 +02:00
KorPhaeron
31836a5deb Removes in world 2015-10-09 22:37:53 -05:00
Razharas
1105a2b820 Merge pull request #11899 from kingofkosmos/altclickrotatepipe 
Alt-click to rotate stuff
 2015-09-24 01:59:04 +03:00
kingofkosmos
65c516607f Adds altclick rotation + description to doppler array, transit tubes, windoor assembly, infrared emitter, emitter, particle accelerator, disposal tubes. 2015-09-20 18:54:23 +03:00
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
c0
df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
duncathan
51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
Aranclanos
1d9bf04edc Adds a Destroy() for the disposal pipe trunk. 
Fixes vent_gas() from the disposal holder from trying to update the air while GCed
 2015-08-18 03:02:09 -03:00
phil235
34b9a045fc Fixes non carbon being stunned when thrown and hitting something dense. 
Fixes being able to enter a disposal bin while buckled.
Fixes items bouncing off delivery chute when thrown into it despite entering the chute.
Fixes being able to leave disposal pipes when moving inside pipes on a janicart.
Fixes some potential runtime (null loc) when flushing the disposal units.
Fixes the thrown range when being ejected from a disposal pipe.
 2015-07-26 20:40:46 +02:00
phil235
c853ec49a9 Repathed disposal unit from machinery/disposal to machinery/disposal/bin. Moved some stuff around, split disposal.dm into disposal-structures.dm and disposal-unit.dm , the latter containing both disposal bin and delivery chute. 2015-07-26 16:20:21 +02:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
spasticVerbalizer
7784054999 Added sanity check to disposal climbing 2015-06-30 15:45:48 +02:00
Ikarrus
8759f56f6f Squashed Commits 2015-06-27 00:09:16 -06:00
Iamgoofball
a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics 
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm
 2015-06-23 12:54:26 -07:00
Remie Richards
ee1e30717a Merge pull request #9980 from LaharlMontogmmery/ContentTransfer 
Container Content Transfer - Good for Review (Again...Again.)
 2015-06-21 00:09:19 +01:00
Swag McYolosteinen
859c5e66e0 Merge pull request #9930 from duncathan/givinunarysomelovin 
Brings some unary devices closer to the present
 2015-06-20 20:14:02 +02:00
LaharlMontogmmery
86d0a50776 Revert dump_act and dump_from_storage 2015-06-18 21:21:41 +02:00
LaharlMontogmmery
38ab424b8b More OOP! Also preparing the bases for another future PR. 2015-06-18 18:59:04 +02:00
LaharlMontogmmery
373c918a4a Going through some hOOPs - bit of a overhaul. 2015-06-18 17:40:35 +02:00
phil235
e6dcabf245 Merge pull request #9960 from xxalpha/bass 
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
 2015-06-18 15:50:35 +02:00
phil235
ae8c69f9a7 Merge pull request #9955 from kingofkosmos/spanspaceremoval 
Unnecessary space removal from spans and messages
 2015-06-15 18:20:04 +02:00
phil235
c0f848250d Merge pull request #9798 from Aranclanos/disposals 
minor disposal fixes
 2015-06-15 00:45:05 +02:00
xxalpha
b2e84a0d3c Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip( 2015-06-14 20:11:40 +01:00
kingofkosmos
c8d79e7034 Removed unnecessary spaces in these situations: 
"span class = '" changed to "span class='"
"'> " changed to "'>"
 2015-06-14 12:13:19 +03:00
Iamgoofball
c2256d41fc BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH 2015-06-13 13:58:08 -07:00
duncathan
dab13732fe cleans up icon paths; modifies certain unary devices 
updates icon paths in multiple files
removed insulated icon state in pipe_item.dmi (insulateds are deaaaad)
lays an icon framework so that o2 generators, cold sinks, heat sinks may eventually be made constructable
  they no longer override update_icon() but instead update like just about every other device
  eventually I'll give these real sprites but given that they're unused it can wait for now
  sprites and construction are outside the scope of this PR
makes heat exchangers update their color based on their node
  because heat exchangers are different sprite-wise they had to override update_icon entirely
makes heat exchanger, heat sinks, cold sinks, o2 generators non-dense
 2015-06-13 02:43:17 -06:00
xxalpha
9cb1061bfb Fixed hacking from inside machines and more. 2015-06-06 11:34:12 +01:00
Aranclanos
2f36bf4694 Merges the two flush() from the disposal bins and disposals deliveryChutes. 
Stops the disposal bin from holding back the machinery controller when flushing.
The mobs clients eye will be instantly moved to the disposal object when the mob is moved into them.
Fixes #1724
 2015-06-05 04:58:34 -03:00
xxalpha
858fb9a33e Added allow_drop() on machinery. 
I didn't actually touch this, git.
 2015-05-16 02:36:02 +01:00
Jordie0608
7369992d3d further reorganization, elimination of old defines folder 2015-05-09 23:16:57 +10:00
Boggart
cd734c8eca Fixes borg modules other than the trash bag not being able to work on disposal bins. 2015-04-30 16:42:25 -06:00
kingofkosmos
761d31cea0 More visible.message span classes removed. 2015-04-24 21:24:21 +03:00
kingofkosmos
de280c72b5 Removed some more spans from visible messages. 2015-04-24 21:06:59 +03:00
kingofkosmos
72749392d8 span classes removed from visible.messages 2015-04-24 20:50:51 +03:00
kingofkosmos
1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
Boggart
ecebb594f9 Fixes being unable to construct disposal pipes on walls and fixes changing the RPD settings while already building affecting the currently building pipes. 
Changes the RPD to use the newer datum/browser ui, makes it so that it show's what you have picked and doesn't let you endlessly repick it.

Fixes my wonky check for bins/outlets/chutes on walls, also adds a changelog.

Undefs the defines in RPD.dm at the end of the file.

Changes the "Type:" label to "Category:"
 2015-04-23 11:53:27 -06:00
MrPerson
5fd9116d0c Fixes infinite rod via disposals duplication 
Fixes #9007
Sadly they still generate a set of rods but at least they only do it once.
 2015-04-16 09:25:03 -07:00
pudl
187a6fdd20 resprites forensic scanner, cargo tagger, and rped 2015-03-22 11:54:26 -05:00
Cheridan
da1e6f57f0 Merge pull request #8334 from MrPerson/cleanup_crew_comin_through 
Code cleanup
 2015-03-15 01:55:39 -05:00
MrPerson
9038fb15af Code cleanup 
Removed a bunch of unused or hardly used vars on /mob and /atom/movable.
Added defines for mob/living/var/mob_size so it's not using magic numbers.
 2015-03-13 10:41:00 -07:00
Remie Richards
751fb4aaa9 Adds SLOT_BACK for energy katana, makes energy katana call emag_act() on what it strikes (mirroring energy/blade functionality cleanly), Removes energy/blade hacks. 2015-03-09 21:48:45 +00:00
phil235
00fdd0eded Monkeys and xeno can flush disposal units. 2015-03-07 22:22:06 +01:00
phil235
fdc0399a46 Ventcrawlers can now climb into disposal by themselves. 2015-03-07 20:03:25 +01:00
phil235
77d553e619 Fixes disposal climbing. 
Aliens, slimes and monkeys can climb into disposal but cannot flush it.
Non carbon mobs can no longer climb into disposal by themselves.
Stuffing another mob in a disposal unit is now only done via grabbing.(fixes bugs like stuffing someone while being inside the disposal yourself)
Large mobs no longer fit inside disposal.
Fixes hydrotray growing overlay layer.
Fixes slicing broken pipes dropping a straight pipe.
Fixes typos.
Removing unused var from disposal.
 2015-03-07 19:35:44 +01:00